diff options
| -rw-r--r-- | nsis/README.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/gui_w32.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/usr_90.txt | 6 | ||||
| -rw-r--r-- | src/GvimExt/GvimExt.reg | 2 | ||||
| -rw-r--r-- | src/GvimExt/README.txt | 2 | ||||
| -rw-r--r-- | src/proto/popupmenu.pro | 2 | ||||
| -rw-r--r-- | src/proto/popupmnu.pro | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
8 files changed, 12 insertions, 28 deletions
diff --git a/nsis/README.txt b/nsis/README.txt index 6ecc57941e..cd4d52ed61 100644 --- a/nsis/README.txt +++ b/nsis/README.txt @@ -14,7 +14,7 @@ To build the installable .exe: gvim.exe (the OLE version), vimrun.exe, install.exe, - uninstal.exe, + uninstall.exe, tee/tee.exe, xxd/xxd.exe, diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index d139d5203c..4065f273a1 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -171,14 +171,14 @@ you can. path {path}\gvim.exe HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6 DisplayName Vim 5.6: Edit with Vim popup menu entry - UninstallString {path}\uninstal.exe + UninstallString {path}\uninstall.exe Replace {path} with the path that leads to the executable. Don't type {default}, this is the value for the key itself. To remove "Edit with Vim" from the popup menu, just remove the registry -entries mentioned above. The "uninstal.exe" program can do this for you. You -can also use the entry in the Windows standard "Add/Remove Programs" list. +entries mentioned above. The "uninstall.exe" program can do this for you. +You can also use the entry in the Windows standard "Add/Remove Programs" list. If you notice that this entry overrules other file type associations, set those associations again by hand (using Windows Explorer, see above). This diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 087de8f2da..6e6b386c8a 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -480,9 +480,9 @@ probably contains your vimrc file and other runtime files that you created, so be careful. Else, if you installed Vim with the zip archives, the preferred way is to use -the "uninstal" program (note the missing l at the end). You can find it in -the same directory as the "install" program, e.g., "c:\vim\vim61". This -should also work from the usual "install/remove software" page. +the "uninstall" program. You can find it in the same directory as the +"install" program, e.g., "c:\vim\vim61". This should also work from the usual +"install/remove software" page. However, this only removes the registry entries for Vim. You have to delete the files yourself. Simply select the directory "vim\vim61" and delete it recursively. There should be no files there that you changed, but you diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg index 2b8ebf08b8..17d085a415 100644 --- a/src/GvimExt/GvimExt.reg +++ b/src/GvimExt/GvimExt.reg @@ -17,4 +17,4 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1] "DisplayName"="Vim 8.1: Edit with Vim popup menu entry" - "UninstallString"="uninstal.exe" + "UninstallString"="uninstall.exe" diff --git a/src/GvimExt/README.txt b/src/GvimExt/README.txt index 4a75cfa7fb..a29200e432 100644 --- a/src/GvimExt/README.txt +++ b/src/GvimExt/README.txt @@ -11,7 +11,7 @@ registry entries. In special situations you might want to make changes by hand. Check these items: -- The gvimext.dll, gvim.exe and uninstal.exe either need to be in the search +- The gvimext.dll, gvim.exe and uninstall.exe either need to be in the search path, or you have to set the full path in the registry entries. You could move the gvimext.dll to the "windows\system" or "windows\system32" directory, where the other DLL files are. diff --git a/src/proto/popupmenu.pro b/src/proto/popupmenu.pro index c01966396c..f5b6c0c90f 100644 --- a/src/proto/popupmenu.pro +++ b/src/proto/popupmenu.pro @@ -1,4 +1,4 @@ -/* popupmnu.c */ +/* popupmenu.c */ void pum_display(pumitem_T *array, int size, int selected); void pum_call_update_screen(void); int pum_under_menu(int row, int col); diff --git a/src/proto/popupmnu.pro b/src/proto/popupmnu.pro deleted file mode 100644 index f5b6c0c90f..0000000000 --- a/src/proto/popupmnu.pro +++ /dev/null @@ -1,18 +0,0 @@ -/* popupmenu.c */ -void pum_display(pumitem_T *array, int size, int selected); -void pum_call_update_screen(void); -int pum_under_menu(int row, int col); -void pum_redraw(void); -void pum_undisplay(void); -void pum_clear(void); -int pum_visible(void); -void pum_may_redraw(void); -int pum_get_height(void); -void pum_set_event_info(dict_T *dict); -int split_message(char_u *mesg, pumitem_T **array); -void ui_remove_balloon(void); -void ui_post_balloon(char_u *mesg, list_T *list); -void ui_may_remove_balloon(void); -void pum_show_popupmenu(vimmenu_T *menu); -void pum_make_popup(char_u *path_name, int use_mouse_pos); -/* vim: set ft=c : */ diff --git a/src/version.c b/src/version.c index d215e908cd..f08e5e0b98 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2086, +/**/ 2085, /**/ 2084, |