summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-16 20:49:18 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-16 20:49:18 +0100
commitabe12a1a4fce36bfa5dea3a0ce85603432d1905b (patch)
tree65a810281aea2a796df3f5d3db511b1f215a658d
parentecafcc15ca92ecb9c6b41dbb3b0fcdf89c9eff69 (diff)
patch 8.1.2309: compiler warning for argument typev8.1.2309
Problem: Compiler warning for argument type. Solution: Use linenr_T and cast to varnumber_T. (John Marriott)
-rw-r--r--src/mouse.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mouse.c b/src/mouse.c
index f215d3d996..00a2783f26 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -3019,7 +3019,7 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
varnumber_T winid = 0;
varnumber_T winrow = 0;
varnumber_T wincol = 0;
- varnumber_T line = 0;
+ linenr_T line = 0;
varnumber_T column = 0;
if (rettv_dict_alloc(rettv) != OK)
@@ -3061,7 +3061,7 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
dict_add_number(d, "winid", winid);
dict_add_number(d, "winrow", winrow);
dict_add_number(d, "wincol", wincol);
- dict_add_number(d, "line", line);
+ dict_add_number(d, "line", (varnumber_T)line);
dict_add_number(d, "column", column);
}
#endif
diff --git a/src/version.c b/src/version.c
index 00aa9e8e3a..5030d7bceb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2309,
+/**/
2308,
/**/
2307,