From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 1 Feb 2020 21:39:32 +0000 (+0100)
Subject: patch 8.2.0193: still build failure without +terminal feature
X-Git-Tag: v8.2.0193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=284d1c24e250494cf886b3548f1ecae5ad262da9;p=thirdparty%2Fvim.git

patch 8.2.0193: still build failure without +terminal feature

Problem:    Still build failure without +terminal feature.
Solution:   Add more #ifdefs.
---

diff --git a/src/macros.h b/src/macros.h
index ce226e3efe..68e3f97569 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -345,9 +345,12 @@
 // 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
 
diff --git a/src/version.c b/src/version.c
index d4a54f95bb..657e1376ab 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 */
+/**/
+    193,
 /**/
     192,
 /**/