commit 29b281ba8ddf176ae34b22e6a9b8e0ddcbcce665
author Bram Moolenaar <Bram@vim.org> Tue Nov 10 20:58:00 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Nov 10 20:58:00 2020 +0100
tree 19645dad310e137675da559f484b5416089bb70b
parent 232f4612e2b0a6a205ae385740078f6b8af05e75

patch 8.2.1974: Vim9: test for has('gui_running') fails with VIMDLL

Problem:    Vim9: test for has('gui_running') fails with VIMDLL.
Solution:   Adjust the #ifdef. (Ken Takata, closes #7276)

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index b5f1c00..8c090e3 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5513,7 +5513,7 @@
 #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)

src/version.c

diff --git a/src/version.c b/src/version.c
index 8535ac5..06fa4d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1974,
+/**/
     1973,
 /**/
     1972,