mirror of
				https://github.com/vim/vim.git
				synced 2025-10-31 09:57:14 -04:00 
			
		
		
		
	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>
			
			
This commit is contained in:
		
				
					committed by
					
						 Christian Brabandt
						Christian Brabandt
					
				
			
			
				
	
			
			
			
						parent
						
							addf9ed620
						
					
				
				
					commit
					ec67ee09d2
				
			| @@ -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" | ||||
|   | ||||
| @@ -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 \ | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -704,6 +704,8 @@ static char *(features[]) = | ||||
|  | ||||
| static int included_patches[] = | ||||
| {   /* Add new patch number below this line */ | ||||
| /**/ | ||||
|     370, | ||||
| /**/ | ||||
|     369, | ||||
| /**/ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user