patch 9.1.0370: MS-Windows: patch number is zero in installer

Problem:  MS-Windows: patch number is zero in installer
          (jonathan-b-wiebe)
Solution: Set VIM_VERSION_PATCHLEVEL, fix a few typos in the installer
          (RestorerZ)

fixes: #14629
closes: #14635

Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index b8ef079dba9275d5318cbf3b3ab86ae27d7b5d34..31f6260d95affd2c35b95603c468b15dde1a6305 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -225,7 +225,7 @@ Page custom SetCustom ValidateCustom
 # Version resources
 
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Vim"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Vim Developers"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The Vim Project"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Vim"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) 1996"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Vi Improved - A Text Editor"

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index aec9efaf9aff9b16286b491b9351c530aa8f7d0c..4d03a722b2c9677cc849cf874e928782cdcbdeb7 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1321,6 +1321,10 @@ $(OUTDIR):
 
 CFLAGS_INST = /nologo /O2 -DNDEBUG -DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS_DEPR)
 
+!IFDEF PATCHLEVEL
+CFLAGS_INST=   $(CFLAGS_INST) -DVIM_VERSION_PATCHLEVEL=$(PATCHLEVEL)
+!ENDIF
+
 install.exe: dosinst.c dosinst.h version.h
        $(CC) $(CFLAGS_INST) dosinst.c kernel32.lib shell32.lib \
                user32.lib ole32.lib advapi32.lib uuid.lib \

diff --git a/src/dosinst.c b/src/dosinst.c
index 35625a7946c0a049670af5ff7e229ca04810b063..116cc8fa40ff90fc1dd0647b0b324d54d9aa6b70 100644 (file)
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1663,7 +1663,7 @@ install_registry(void)
        uninstall_string,
        icon_string,
        version_string,
-       "Bram Moolenaar et al.");
+       "The Vim Project");
     if (ERROR_SUCCESS != lRet)
        return FAIL;
 

diff --git a/src/version.c b/src/version.c
index 658a410271091c6db9aab0e753b03ec2c735b452..dc903edc34fc93b518d78b96becd26565d51943f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    370,
 /**/
     369,
 /**/