# HG changeset patch # User Bram Moolenaar # Date 1570886103 -7200 # Node ID 50a16f2a54a8160424c3c196d47fbf550724c0f6 # Parent 8263892c8cc242ddd5bfe512f8c580ef1bb3f143 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 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. diff --git a/src/version.c b/src/version.c --- 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, diff --git a/src/vim.rc b/src/vim.rc --- 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"