From 4cdbed33e467bdfed9aa90dc0f96642c91db32bb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 12 Oct 2019 15:02:47 +0200 Subject: [PATCH] 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. --- src/version.c | 2 ++ src/vim.rc | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/version.c b/src/version.c index a6a139838..9cb3a0156 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2138, /**/ 2137, /**/ diff --git a/src/vim.rc b/src/vim.rc index 726cb9640..3307c8e51 100644 --- a/src/vim.rc +++ b/src/vim.rc @@ -58,8 +58,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf" // 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" -- 2.50.1