changeset 14558:43de18e870c4 v8.1.0292

patch 8.1.0292: MS-Windows: the text "self-installing" confuses some users commit https://github.com/vim/vim/commit/9bc1eac2c75d8440c68f305302bc5bdef515f489 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 18 19:04:37 2018 +0200 patch 8.1.0292: MS-Windows: the text "self-installing" confuses some users Problem: MS-Windows: the text "self-installing" confuses some users. Solution: Remove the text from the uninstall entry. (closes https://github.com/vim/vim/issues/3337)
author Christian Brabandt <cb@256bit.org>
date Sat, 18 Aug 2018 19:15:05 +0200
parents 86147c8ef88c
children 458a3228e423
files src/dosinst.c src/version.c
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1575,18 +1575,13 @@ install_registry(void)
     }
 
     printf("Creating an uninstall entry\n");
+    sprintf(display_name, "Vim " VIM_VERSION_SHORT);
 
     /* For the NSIS installer use the generated uninstaller. */
     if (interactive)
-    {
-	sprintf(display_name, "Vim " VIM_VERSION_SHORT);
 	sprintf(uninstall_string, "%s\\uninstal.exe", installdir);
-    }
     else
-    {
-	sprintf(display_name, "Vim " VIM_VERSION_SHORT " (self-installing)");
 	sprintf(uninstall_string, "%s\\uninstall-gui.exe", installdir);
-    }
 
     lRet = register_uninstall(
 	HKEY_LOCAL_MACHINE,
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    292,
+/**/
     291,
 /**/
     290,