summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-12 15:02:47 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-12 15:02:47 +0200
commit4cdbed33e467bdfed9aa90dc0f96642c91db32bb (patch)
tree90bd18a0b24e4072b60e7ba7e9dfb4c9cf04a2a3
parent1a4cbb19ded7ad6cb161f2797e0414032d1f9b5c (diff)
downloadvim-git-4cdbed33e467bdfed9aa90dc0f96642c91db32bb.tar.gz
patch 8.1.2138: including the build number in the Win32 binary is confusingv8.1.2138
Problem: Including the build number in the Win32 binary is confusing. Solution: Only use the patchlevel.
-rw-r--r--src/version.c2
-rw-r--r--src/vim.rc8
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
@@ -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
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"