From 284d1c24e250494cf886b3548f1ecae5ad262da9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 1 Feb 2020 22:39:32 +0100 Subject: [PATCH] patch 8.2.0193: still build failure without +terminal feature Problem: Still build failure without +terminal feature. Solution: Add more #ifdefs. --- src/macros.h | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) 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, /**/ -- 2.47.3