summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-07 16:28:13 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-07 16:28:13 +0200
commit7e1a5af5409120835f6c51c8d26ad7891a966aa8 (patch)
tree996e1523cc7cef76f7e8259f9ec547c6cd3fb918
parent4fa06870e5d347c30fe55290dab87e494c8aa06a (diff)
downloadvim-git-7e1a5af5409120835f6c51c8d26ad7891a966aa8.tar.gz
patch 8.1.1287: cannot build with +eval but without +mousev8.1.1287
Problem: Cannot build with +eval but without +mouse. Solution: Add #ifdefs around f_test_setmouse(). (John Marriott)
-rw-r--r--src/evalfunc.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index a2be7b903..ba3db95c9 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -456,7 +456,9 @@ static void f_test_null_string(typval_T *argvars, typval_T *rettv);
#ifdef FEAT_GUI
static void f_test_scrollbar(typval_T *argvars, typval_T *rettv);
#endif
+#ifdef FEAT_MOUSE
static void f_test_setmouse(typval_T *argvars, typval_T *rettv);
+#endif
static void f_test_settime(typval_T *argvars, typval_T *rettv);
#ifdef FEAT_FLOAT
static void f_tan(typval_T *argvars, typval_T *rettv);
@@ -994,7 +996,9 @@ static struct fst
#ifdef FEAT_GUI
{"test_scrollbar", 3, 3, f_test_scrollbar},
#endif
+#ifdef FEAT_MOUSE
{"test_setmouse", 2, 2, f_test_setmouse},
+#endif
{"test_settime", 1, 1, f_test_settime},
#ifdef FEAT_TIMERS
{"timer_info", 0, 1, f_timer_info},
@@ -14499,12 +14503,14 @@ f_test_scrollbar(typval_T *argvars, typval_T *rettv UNUSED)
}
#endif
+#ifdef FEAT_MOUSE
static void
f_test_setmouse(typval_T *argvars, typval_T *rettv UNUSED)
{
mouse_row = (time_t)tv_get_number(&argvars[0]) - 1;
mouse_col = (time_t)tv_get_number(&argvars[1]) - 1;
}
+#endif
static void
f_test_settime(typval_T *argvars, typval_T *rettv UNUSED)
diff --git a/src/version.c b/src/version.c
index 098c723a6..e2ca5b04a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1287,
+/**/
1286,
/**/
1285,