To: vim_dev@googlegroups.com Subject: Patch 8.1.2086 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2086 (after 8.1.2082) Problem: Missing a few changes for the renamed files. Solution: Rename in a few more places. (Ken Takata) 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 *** ../vim-8.1.2085/nsis/README.txt 2019-01-10 21:49:51.982405995 +0100 --- nsis/README.txt 2019-09-27 14:17:41.984577917 +0200 *************** *** 14,20 **** gvim.exe (the OLE version), vimrun.exe, install.exe, ! uninstal.exe, tee/tee.exe, xxd/xxd.exe, --- 14,20 ---- gvim.exe (the OLE version), vimrun.exe, install.exe, ! uninstall.exe, tee/tee.exe, xxd/xxd.exe, *** ../vim-8.1.2085/runtime/doc/gui_w32.txt 2019-05-05 18:11:46.312590682 +0200 --- runtime/doc/gui_w32.txt 2019-09-27 14:17:41.984577917 +0200 *************** *** 171,184 **** 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 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. If you notice that this entry overrules other file type associations, set those associations again by hand (using Windows Explorer, see above). This --- 171,184 ---- 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}\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 "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 *** ../vim-8.1.2085/runtime/doc/usr_90.txt 2019-05-09 15:12:45.164723999 +0200 --- runtime/doc/usr_90.txt 2019-09-27 14:17:41.984577917 +0200 *************** *** 480,488 **** 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. 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 --- 480,488 ---- be careful. Else, if you installed Vim with the zip archives, the preferred way is to use ! 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 *** ../vim-8.1.2085/src/GvimExt/GvimExt.reg 2018-05-17 13:42:16.000000000 +0200 --- src/GvimExt/GvimExt.reg 2019-09-27 14:17:41.984577917 +0200 *************** *** 17,20 **** [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1] "DisplayName"="Vim 8.1: Edit with Vim popup menu entry" ! "UninstallString"="uninstal.exe" --- 17,20 ---- [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1] "DisplayName"="Vim 8.1: Edit with Vim popup menu entry" ! "UninstallString"="uninstall.exe" *** ../vim-8.1.2085/src/GvimExt/README.txt 2010-05-15 13:04:10.000000000 +0200 --- src/GvimExt/README.txt 2019-09-27 14:17:41.984577917 +0200 *************** *** 11,17 **** 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 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. --- 11,17 ---- In special situations you might want to make changes by hand. Check these items: ! - 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. *** ../vim-8.1.2085/src/proto/popupmenu.pro 2019-09-27 13:07:59.569833456 +0200 --- src/proto/popupmenu.pro 2019-09-27 14:17:41.984577917 +0200 *************** *** 1,4 **** ! /* popupmnu.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); --- 1,4 ---- ! /* 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); *** ../vim-8.1.2085/src/proto/popupmnu.pro 2019-09-27 13:07:59.569833456 +0200 --- src/proto/popupmnu.pro 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,18 **** - /* 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 : */ --- 0 ---- *** ../vim-8.1.2085/src/version.c 2019-09-27 14:14:29.001447700 +0200 --- src/version.c 2019-09-27 14:18:13.800434350 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 2086, /**/ -- [clop clop] MORTICIAN: Who's that then? CUSTOMER: I don't know. MORTICIAN: Must be a king. CUSTOMER: Why? MORTICIAN: He hasn't got shit all over him. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///