From ec67ee09d2f04804a14408e035faec9fe06b19b8 Mon Sep 17 00:00:00 2001 From: RestorerZ Date: Thu, 25 Apr 2024 21:25:19 +0200 Subject: 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 Signed-off-by: Christian Brabandt --- src/Make_mvc.mak | 4 ++++ src/dosinst.c | 2 +- src/version.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') 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, /**/ -- cgit v1.2.3