]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 8.2.0193: still build failure without +terminal feature v8.2.0193
authorBram Moolenaar <Bram@vim.org>
Sat, 1 Feb 2020 21:39:32 +0000 (22:39 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 1 Feb 2020 21:39:32 +0000 (22:39 +0100)
Problem:    Still build failure without +terminal feature.
Solution:   Add more #ifdefs.

src/macros.h
src/version.c

index ce226e3efe5070e0bc1b11a20936f650af72c2c9..68e3f975695557500dc4f230ee192d3aa672e986 100644 (file)
 // Give an error in curwin is a popup window and evaluate to TRUE.
 #ifdef FEAT_PROP_POPUP
 # define ERROR_IF_POPUP_WINDOW error_if_popup_window()
-# define ERROR_IF_TERM_POPUP_WINDOW error_if_term_popup_window()
 #else
 # define ERROR_IF_POPUP_WINDOW 0
+#endif
+#if defined(FEAT_PROP_POPUP) && defined(FEAT_TERMINAL)
+# define ERROR_IF_TERM_POPUP_WINDOW error_if_term_popup_window()
+#else
 # define ERROR_IF_TERM_POPUP_WINDOW 0
 #endif
 
index d4a54f95bbc024cf729834b9b6544ffced80b32a..657e1376ab06db86440cbf8dca8937c5bbe506d8 100644 (file)
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    193,
 /**/
     192,
 /**/