From ec67ee09d2f04804a14408e035faec9fe06b19b8 Mon Sep 17 00:00:00 2001
From: RestorerZ <restorer@mail2k.ru>
Date: Thu, 25 Apr 2024 21:25:19 +0200
Subject: [PATCH] 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>
---
 nsis/gvim.nsi    | 2 +-
 src/Make_mvc.mak | 4 ++++
 src/dosinst.c    | 2 +-
 src/version.c    | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index b8ef079dba..31f6260d95 100644
--- 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 aec9efaf9a..4d03a722b2 100644
--- 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 35625a7946..116cc8fa40 100644
--- 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 658a410271..dc903edc34 100644
--- 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,
 /**/