diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-01 22:39:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-01 22:39:32 +0100 |
| commit | 284d1c24e250494cf886b3548f1ecae5ad262da9 (patch) | |
| tree | 0b396e818d63e1dcf4360c40c2de9025a68eff21 | |
| parent | 91cd59a0a20b944f703ca65e67f2e637fbb7e812 (diff) | |
| download | vim-git-284d1c24e250494cf886b3548f1ecae5ad262da9.tar.gz | |
patch 8.2.0193: still build failure without +terminal featurev8.2.0193
Problem: Still build failure without +terminal feature.
Solution: Add more #ifdefs.
| -rw-r--r-- | src/macros.h | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/macros.h b/src/macros.h index ce226e3ef..68e3f9756 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 d4a54f95b..657e1376a 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 193, +/**/ 192, /**/ 191, |