diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-19 20:13:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-19 20:13:05 +0100 |
| commit | 669a828cdc1f019e7abda0e5e9b223d7897f06a8 (patch) | |
| tree | 16601aabeea02b3d302fdf499bd4a1a890ee3d4c | |
| parent | 246fe03d154c09070d5b7365b7f61716c4e0ddd4 (diff) | |
patch 8.0.1319: can't build GUI on MS-Windowsv8.0.1319
Problem: Can't build GUI on MS-Windows.
Solution: Don't define the balloon_split() function in a GUI-only build.
| -rw-r--r-- | runtime/doc/eval.txt | 5 | ||||
| -rw-r--r-- | src/evalfunc.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2ce6c48efc..d753924df3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2708,13 +2708,16 @@ balloon_show({expr}) *balloon_show()* When showing a balloon is not possible nothing happens, no error message. - {only available when compiled with the +balloon_eval feature} + {only available when compiled with the +balloon_eval or + +balloon_eval_term feature} balloon_split({msg}) *balloon_split()* Split {msg} into lines to be displayed in a balloon. The splits are made for the current window size and optimize to show debugger output. Returns a |List| with the split lines. + {only available when compiled with the +balloon_eval_term + feature} *browse()* browse({save}, {title}, {initdir}, {default}) diff --git a/src/evalfunc.c b/src/evalfunc.c index 77a4fc2c05..8d288e0dc5 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -61,7 +61,9 @@ static void f_atan2(typval_T *argvars, typval_T *rettv); #endif #ifdef FEAT_BEVAL static void f_balloon_show(typval_T *argvars, typval_T *rettv); +# if defined(FEAT_BEVAL_TERM) static void f_balloon_split(typval_T *argvars, typval_T *rettv); +# endif #endif static void f_browse(typval_T *argvars, typval_T *rettv); static void f_browsedir(typval_T *argvars, typval_T *rettv); @@ -495,7 +497,9 @@ static struct fst #endif #ifdef FEAT_BEVAL {"balloon_show", 1, 1, f_balloon_show}, +# if defined(FEAT_BEVAL_TERM) {"balloon_split", 1, 1, f_balloon_split}, +# endif #endif {"browse", 4, 4, f_browse}, {"browsedir", 2, 2, f_browsedir}, @@ -1424,6 +1428,7 @@ f_balloon_show(typval_T *argvars, typval_T *rettv UNUSED) } } +# if defined(FEAT_BEVAL_TERM) static void f_balloon_split(typval_T *argvars, typval_T *rettv UNUSED) { @@ -1444,6 +1449,7 @@ f_balloon_split(typval_T *argvars, typval_T *rettv UNUSED) } } } +# endif #endif /* diff --git a/src/version.c b/src/version.c index 9896a77159..2e52e806cf 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1319, +/**/ 1318, /**/ 1317, |