From 16d79a3b621e5aa21a3ec50ba4c3bfc522a3a7b3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 18 Jul 2010 22:33:56 +0200
Subject: [PATCH] Fix: MS-Windows installer used wrong path for uninstaller
key.
---
runtime/doc/todo.txt | 2 --
src/dosinst.c | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e80ec5fc01..46dd1a19a6 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1089,8 +1089,6 @@ Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
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)
diff --git a/src/dosinst.c b/src/dosinst.c
index 0923cf78fe..ef41081ef9 100644
--- 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(
--
GitLab