Skip to content

Commit 38f1eea

Browse files
committed
patch 8.1.2086: missing a few changes for the renamed files
Problem: Missing a few changes for the renamed files. Solution: Rename in a few more places. (Ken Takata)
1 parent 2313b61 commit 38f1eea

8 files changed

Lines changed: 12 additions & 28 deletions

File tree

nsis/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To build the installable .exe:
1414
gvim.exe (the OLE version),
1515
vimrun.exe,
1616
install.exe,
17-
uninstal.exe,
17+
uninstall.exe,
1818
tee/tee.exe,
1919
xxd/xxd.exe,
2020

runtime/doc/gui_w32.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ you can.
171171
path {path}\gvim.exe
172172
HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6
173173
DisplayName Vim 5.6: Edit with Vim popup menu entry
174-
UninstallString {path}\uninstal.exe
174+
UninstallString {path}\uninstall.exe
175175

176176
Replace {path} with the path that leads to the executable.
177177
Don't type {default}, this is the value for the key itself.
178178

179179
To remove "Edit with Vim" from the popup menu, just remove the registry
180-
entries mentioned above. The "uninstal.exe" program can do this for you. You
181-
can also use the entry in the Windows standard "Add/Remove Programs" list.
180+
entries mentioned above. The "uninstall.exe" program can do this for you.
181+
You can also use the entry in the Windows standard "Add/Remove Programs" list.
182182

183183
If you notice that this entry overrules other file type associations, set
184184
those associations again by hand (using Windows Explorer, see above). This

runtime/doc/usr_90.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ probably contains your vimrc file and other runtime files that you created, so
480480
be careful.
481481

482482
Else, if you installed Vim with the zip archives, the preferred way is to use
483-
the "uninstal" program (note the missing l at the end). You can find it in
484-
the same directory as the "install" program, e.g., "c:\vim\vim61". This
485-
should also work from the usual "install/remove software" page.
483+
the "uninstall" program. You can find it in the same directory as the
484+
"install" program, e.g., "c:\vim\vim61". This should also work from the usual
485+
"install/remove software" page.
486486
However, this only removes the registry entries for Vim. You have to
487487
delete the files yourself. Simply select the directory "vim\vim61" and delete
488488
it recursively. There should be no files there that you changed, but you

src/GvimExt/GvimExt.reg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ REGEDIT4
1717

1818
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1]
1919
"DisplayName"="Vim 8.1: Edit with Vim popup menu entry"
20-
"UninstallString"="uninstal.exe"
20+
"UninstallString"="uninstall.exe"

src/GvimExt/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ registry entries.
1111

1212
In special situations you might want to make changes by hand. Check these
1313
items:
14-
- The gvimext.dll, gvim.exe and uninstal.exe either need to be in the search
14+
- The gvimext.dll, gvim.exe and uninstall.exe either need to be in the search
1515
path, or you have to set the full path in the registry entries. You could
1616
move the gvimext.dll to the "windows\system" or "windows\system32"
1717
directory, where the other DLL files are.

src/proto/popupmenu.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* popupmnu.c */
1+
/* popupmenu.c */
22
void pum_display(pumitem_T *array, int size, int selected);
33
void pum_call_update_screen(void);
44
int pum_under_menu(int row, int col);

src/proto/popupmnu.pro

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,8 @@ static char *(features[]) =
757757

758758
static int included_patches[] =
759759
{ /* Add new patch number below this line */
760+
/**/
761+
2086,
760762
/**/
761763
2085,
762764
/**/

0 commit comments

Comments
 (0)