Mercurial > vim
changeset 18182:9b6bfce90778 v8.1.2086
patch 8.1.2086: missing a few changes for the renamed files
Commit: https://github.com/vim/vim/commit/38f1eeac3d8ec0a0e275213a62ba7ff1afb8ab33
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 27 14:19:09 2019 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 27 Sep 2019 14:30:04 +0200 |
| parents | f515ac0166a8 |
| children | 6ebaf89b7a05 |
| files | nsis/README.txt runtime/doc/gui_w32.txt runtime/doc/usr_90.txt src/GvimExt/GvimExt.reg src/GvimExt/README.txt src/proto/popupmenu.pro src/proto/popupmnu.pro src/version.c |
| diffstat | 8 files changed, 12 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/nsis/README.txt +++ b/nsis/README.txt @@ -14,7 +14,7 @@ 2. Go to the src directory and build: gvim.exe (the OLE version), vimrun.exe, install.exe, - uninstal.exe, + uninstall.exe, tee/tee.exe, xxd/xxd.exe,
--- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -171,14 +171,14 @@ 2. Add these keys: 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
--- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -480,9 +480,9 @@ probably contains your vimrc file and ot 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
--- 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"
--- 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.
--- 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);
deleted file mode 100644 --- 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 : */