From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 19 Nov 2017 19:13:05 +0000 (+0100)
Subject: patch 8.0.1319: can't build GUI on MS-Windows
X-Git-Tag: v8.0.1319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=669a828cdc1f019e7abda0e5e9b223d7897f06a8;p=vim

patch 8.0.1319: can't build GUI on MS-Windows

Problem:    Can't build GUI on MS-Windows.
Solution:   Don't define the balloon_split() function in a GUI-only build.
---

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2ce6c48ef..d753924df 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 77a4fc2c0..8d288e0dc 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 9896a7715..2e52e806c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1319,
 /**/
     1318,
 /**/