0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2019-09-27 14:19:09 +02:00
parent 2313b61257
commit 38f1eeac3d
8 changed files with 12 additions and 28 deletions

View File

@@ -14,7 +14,7 @@ To build the installable .exe:
gvim.exe (the OLE version), gvim.exe (the OLE version),
vimrun.exe, vimrun.exe,
install.exe, install.exe,
uninstal.exe, uninstall.exe,
tee/tee.exe, tee/tee.exe,
xxd/xxd.exe, xxd/xxd.exe,

View File

@@ -171,14 +171,14 @@ you can.
path {path}\gvim.exe path {path}\gvim.exe
HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6 HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6
DisplayName Vim 5.6: Edit with Vim popup menu entry 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. Replace {path} with the path that leads to the executable.
Don't type {default}, this is the value for the key itself. 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 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 entries mentioned above. The "uninstall.exe" program can do this for you.
can also use the entry in the Windows standard "Add/Remove Programs" list. 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 If you notice that this entry overrules other file type associations, set
those associations again by hand (using Windows Explorer, see above). This those associations again by hand (using Windows Explorer, see above). This

View File

@@ -480,9 +480,9 @@ probably contains your vimrc file and other runtime files that you created, so
be careful. be careful.
Else, if you installed Vim with the zip archives, the preferred way is to use 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 "uninstall" program. You can find it in the same directory as the
the same directory as the "install" program, e.g., "c:\vim\vim61". This "install" program, e.g., "c:\vim\vim61". This should also work from the usual
should also work from the usual "install/remove software" page. "install/remove software" page.
However, this only removes the registry entries for Vim. You have to However, this only removes the registry entries for Vim. You have to
delete the files yourself. Simply select the directory "vim\vim61" and delete 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 it recursively. There should be no files there that you changed, but you

View File

@@ -17,4 +17,4 @@ REGEDIT4
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1] [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1]
"DisplayName"="Vim 8.1: Edit with Vim popup menu entry" "DisplayName"="Vim 8.1: Edit with Vim popup menu entry"
"UninstallString"="uninstal.exe" "UninstallString"="uninstall.exe"

View File

@@ -11,7 +11,7 @@ registry entries.
In special situations you might want to make changes by hand. Check these In special situations you might want to make changes by hand. Check these
items: 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 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" move the gvimext.dll to the "windows\system" or "windows\system32"
directory, where the other DLL files are. directory, where the other DLL files are.

View File

@@ -1,4 +1,4 @@
/* popupmnu.c */ /* popupmenu.c */
void pum_display(pumitem_T *array, int size, int selected); void pum_display(pumitem_T *array, int size, int selected);
void pum_call_update_screen(void); void pum_call_update_screen(void);
int pum_under_menu(int row, int col); int pum_under_menu(int row, int col);

View File

@@ -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 : */

View File

@@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2086,
/**/ /**/
2085, 2085,
/**/ /**/