Mercurial > vim

changeset 2344:a2b15b1e626d vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix: MS-Windows installer used wrong path for uninstaller key.
author Bram Moolenaar <bram@vim.org>
date Sun, 18 Jul 2010 22:33:56 +0200
parents 0703d2fd5749
children 12b829477c60
files runtime/doc/todo.txt src/dosinst.c
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1089,8 +1089,6 @@ 2010 Jun 30)
 
 Before (beta) release 7.3:
 - Documentation for Python 3 support.
-- MS-Windows uninstaller looks for wrong executable:
-    "ool\vimfiles\syntaxuninstall-gui.exe".
 
 Before release 7.3:
 - Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23)
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1525,7 +1525,6 @@ install_registry(void)
     const char	*vim_ext_ThreadingModel = "Apartment";
     const char	*vim_ext_name = "Vim Shell Extension";
     const char	*vim_ext_clsid = "{51EEE242-AD87-11d3-9C1E-0090278BBD99}";
-    char	buf[BUFSIZE];
     char	vim_exe_path[BUFSIZE];
     char	display_name[BUFSIZE];
     char	uninstall_string[BUFSIZE];
@@ -1571,12 +1570,12 @@ install_registry(void)
     if (interactive)
     {
 	sprintf(display_name, "Vim " VIM_VERSION_SHORT);
-	sprintf(uninstall_string, "%suninstal.exe", buf);
+	sprintf(uninstall_string, "%s\\uninstal.exe", installdir);
     }
     else
     {
 	sprintf(display_name, "Vim " VIM_VERSION_SHORT " (self-installing)");
-	sprintf(uninstall_string, "%suninstall-gui.exe", buf);
+	sprintf(uninstall_string, "%s\\uninstall-gui.exe", installdir);
     }
 
     lRet = register_uninstall(