summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-01-13 16:06:45 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-13 16:06:45 +0000
commit33b25d1317e4c06ec6b1cafb46ea9cde475a61ae (patch)
tree1a7eee5fb415e15add2581e68a878e46a41ffd5d
parentced2b38a560cc4f4ec983ed2cf4372ab62e1dbc1 (diff)
downloadvim-git-33b25d1317e4c06ec6b1cafb46ea9cde475a61ae.tar.gz
patch 8.2.4079: MS-Windows: "gvim --version" didn't work with VIMDLLv8.2.4079
Problem: MS-Windows: "gvim --version" didn't work when build with VIMDLL. Solution: Adjust #ifdef. (Ken Takata, closes #9517)
-rw-r--r--src/main.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 5723d4633..8f3856f7e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2004,7 +2004,7 @@ command_line_scan(mparm_T *parmp)
{
Columns = 80; // need to init Columns
info_message = TRUE; // use mch_msg(), not mch_errmsg()
-#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI)
+#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI) && !defined(VIMDLL)
gui.starting = FALSE; // not starting GUI, will exit
#endif
list_version();
diff --git a/src/version.c b/src/version.c
index 7f631da2f..839687418 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 */
/**/
+ 4079,
+/**/
4078,
/**/
4077,