summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-10 20:58:00 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-10 20:58:00 +0100
commit29b281ba8ddf176ae34b22e6a9b8e0ddcbcce665 (patch)
tree19645dad310e137675da559f484b5416089bb70b
parent232f4612e2b0a6a205ae385740078f6b8af05e75 (diff)
downloadvim-git-29b281ba8ddf176ae34b22e6a9b8e0ddcbcce665.tar.gz
patch 8.2.1974: Vim9: test for has('gui_running') fails with VIMDLLv8.2.1974
Problem: Vim9: test for has('gui_running') fails with VIMDLL. Solution: Adjust the #ifdef. (Ken Takata, closes #7276)
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b5f1c0051..8c090e361 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5513,7 +5513,7 @@ dynamic_feature(char_u *feature)
#ifdef VIMDLL
|| STRICMP(feature, "filterpipe") == 0
#endif
-#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI)
+#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI) && !defined(VIMDLL)
// this can only change on Unix where the ":gui" command could be
// used.
|| (STRICMP(feature, "gui_running") == 0 && !gui.in_use)
diff --git a/src/version.c b/src/version.c
index 8535ac554..06fa4d041 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1974,
+/**/
1973,
/**/
1972,