changeset 18287:50a16f2a54a8 v8.1.2138

patch 8.1.2138: including the build number in the Win32 binary is confusing Commit: https://github.com/vim/vim/commit/4cdbed33e467bdfed9aa90dc0f96642c91db32bb Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 12 15:02:47 2019 +0200 patch 8.1.2138: including the build number in the Win32 binary is confusing Problem: Including the build number in the Win32 binary is confusing. Solution: Only use the patchlevel.
author Bram Moolenaar <Bram@vim.org>
date Sat, 12 Oct 2019 15:15:03 +0200
parents 8263892c8cc2
children d65f4e1cc30f
files src/version.c src/vim.rc
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2138,
+/**/
     2137,
 /**/
     2136,
--- a/src/vim.rc
+++ b/src/vim.rc
@@ -58,8 +58,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MA
 //
 
 VS_VERSION_INFO		VERSIONINFO
-  FILEVERSION		VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_BUILD,VIM_VERSION_PATCHLEVEL
-  PRODUCTVERSION	VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_BUILD,VIM_VERSION_PATCHLEVEL
+  FILEVERSION		VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_PATCHLEVEL
+  PRODUCTVERSION	VIM_VERSION_MAJOR,VIM_VERSION_MINOR,VIM_VERSION_PATCHLEVEL
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
 
 #if VIM_VERSION_PATCHLEVEL > 0
@@ -91,7 +91,7 @@ BEGIN
     BEGIN
 	VALUE "CompanyName",		"Vim Developers\0"
 	VALUE "FileDescription",	"Vi Improved - A Text Editor\0"
-	VALUE "FileVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR  "\0"
+	VALUE "FileVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_PATCHLEVEL_STR  "\0"
 	VALUE "InternalName",		"VIM\0"
 	VALUE "LegalCopyright",		"Copyright \251 1996\0"
 	VALUE "LegalTrademarks",	"Vim\0"
@@ -103,7 +103,7 @@ BEGIN
 	VALUE "OriginalFilename",	"vim.exe\0"
 #endif
 	VALUE "ProductName",		"Vim\0"
-	VALUE "ProductVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR "\0"
+	VALUE "ProductVersion",		VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_PATCHLEVEL_STR "\0"
     END
   END
   BLOCK "VarFileInfo"