diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-09-27 13:08:36 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-09-27 13:08:36 +0200 |
commit | 30e8e73506e4522ef4aebf7d525c0e6ffe8805fd (patch) | |
tree | 572d933103927bda359c6f5bdcbf51447f703912 /src | |
parent | 46a426c9acfdd3d6c0fa134a17681634b9325bee (diff) |
patch 8.1.2082: some files have a weird name to fit in 8.3 charactersv8.1.2082
Problem: Some files have a weird name to fit in 8.3 characters.
Solution: Use a nicer names.
Diffstat (limited to 'src')
-rw-r--r-- | src/INSTALLpc.txt | 2 | ||||
-rw-r--r-- | src/Make_cyg_ming.mak | 10 | ||||
-rw-r--r-- | src/Make_morph.mak | 2 | ||||
-rw-r--r-- | src/Make_mvc.mak | 14 | ||||
-rw-r--r-- | src/Make_vms.mms | 8 | ||||
-rw-r--r-- | src/Makefile | 12 | ||||
-rw-r--r-- | src/README.md | 2 | ||||
-rw-r--r-- | src/dosinst.c | 6 | ||||
-rw-r--r-- | src/dosinst.h | 2 | ||||
-rw-r--r-- | src/popupmenu.c (renamed from src/popupmnu.c) | 2 | ||||
-rw-r--r-- | src/proto.h | 2 | ||||
-rw-r--r-- | src/proto/popupmenu.pro | 18 | ||||
-rw-r--r-- | src/proto/popupmnu.pro | 2 | ||||
-rw-r--r-- | src/uninstall.c (renamed from src/uninstal.c) | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
15 files changed, 54 insertions, 34 deletions
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index c72875a8be..ce80a9aa4a 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -1023,7 +1023,7 @@ correct directory structure. Move the "vim81" subdirectory into the subdirectory where you want Vim to be installed. Typically, this subdirectory will be named "vim". If you already have a "vim81" subdirectory in "vim", delete it first - by running its uninstal.exe program. + by running its uninstall.exe program. E. Install Vim --------------- diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 521ec3a35e..01f6233bfb 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -764,7 +764,7 @@ OBJ = \ $(OUTDIR)/os_mswin.o \ $(OUTDIR)/os_win32.o \ $(OUTDIR)/pathdef.o \ - $(OUTDIR)/popupmnu.o \ + $(OUTDIR)/popupmenu.o \ $(OUTDIR)/popupwin.o \ $(OUTDIR)/profiler.o \ $(OUTDIR)/quickfix.o \ @@ -1015,7 +1015,7 @@ ifeq (yes, $(MAP)) LFLAGS += -Wl,-Map=$(TARGET).map endif -all: $(MAIN_TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstal.exe GvimExt/gvimext.dll +all: $(MAIN_TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstall.exe GvimExt/gvimext.dll vimrun.exe: vimrun.c $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIB) @@ -1023,8 +1023,8 @@ vimrun.exe: vimrun.c install.exe: dosinst.c $(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid -uninstal.exe: uninstal.c - $(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIB) -lole32 +uninstall.exe: uninstall.c + $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 ifeq ($(VIMDLL),yes) $(TARGET): $(OUTDIR) $(OBJ) @@ -1068,7 +1068,7 @@ clean: -$(DEL) $(OUTDIR)$(DIRSLASH)*.res -$(DEL) $(OUTDIR)$(DIRSLASH)pathdef.c -rmdir $(OUTDIR) - -$(DEL) $(MAIN_TARGET) vimrun.exe install.exe uninstal.exe + -$(DEL) $(MAIN_TARGET) vimrun.exe install.exe uninstall.exe ifdef PERL -$(DEL) if_perl.c -$(DEL) auto$(DIRSLASH)if_perl.c diff --git a/src/Make_morph.mak b/src/Make_morph.mak index 9c070c8e26..f0d9cf8144 100644 --- a/src/Make_morph.mak +++ b/src/Make_morph.mak @@ -81,7 +81,7 @@ SRC = arabic.c \ option.c \ optionstr.c \ os_amiga.c \ - popupmnu.c \ + popupmenu.c \ profiler.c \ quickfix.c \ regexp.c \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 9146c7934e..762b349a7f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -771,7 +771,7 @@ OBJ = \ $(OUTDIR)\os_mswin.obj \ $(OUTDIR)\os_win32.obj \ $(OUTDIR)\pathdef.obj \ - $(OUTDIR)\popupmnu.obj \ + $(OUTDIR)\popupmenu.obj \ $(OUTDIR)\popupwin.obj \ $(OUTDIR)\profiler.obj \ $(OUTDIR)\quickfix.obj \ @@ -1280,7 +1280,7 @@ MAIN_TARGET = $(VIM).exe all: $(MAIN_TARGET) \ vimrun.exe \ install.exe \ - uninstal.exe \ + uninstall.exe \ xxd/xxd.exe \ tee/tee.exe \ GvimExt/gvimext.dll @@ -1339,8 +1339,8 @@ install.exe: dosinst.c - if exist install.exe del install.exe ren dosinst.exe install.exe -uninstal.exe: uninstal.c - $(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib \ +uninstall.exe: uninstall.c + $(CC) /nologo -DNDEBUG -DWIN32 uninstall.c shell32.lib advapi32.lib \ -link -subsystem:$(SUBSYSTEM_TOOLS) vimrun.exe: vimrun.c @@ -1387,7 +1387,7 @@ clean: !endif - if exist vimrun.exe del vimrun.exe - if exist install.exe del install.exe - - if exist uninstal.exe del uninstal.exe + - if exist uninstall.exe del uninstall.exe - if exist if_perl.c del if_perl.c - if exist auto\if_perl.c del auto\if_perl.c - if exist dimm.h del dimm.h @@ -1643,7 +1643,7 @@ $(OUTDIR)/os_w32exeg.obj: $(OUTDIR) os_w32exe.c $(INCL) $(OUTDIR)/pathdef.obj: $(OUTDIR) $(PATHDEF_SRC) $(INCL) $(CC) $(CFLAGS_OUTDIR) $(PATHDEF_SRC) -$(OUTDIR)/popupmnu.obj: $(OUTDIR) popupmnu.c $(INCL) +$(OUTDIR)/popupmenu.obj: $(OUTDIR) popupmenu.c $(INCL) $(OUTDIR)/popupwin.obj: $(OUTDIR) popupwin.c $(INCL) @@ -1841,7 +1841,7 @@ proto.h: \ proto/os_mswin.pro \ proto/winclip.pro \ proto/os_win32.pro \ - proto/popupmnu.pro \ + proto/popupmenu.pro \ proto/popupwin.pro \ proto/profiler.pro \ proto/quickfix.pro \ diff --git a/src/Make_vms.mms b/src/Make_vms.mms index 3b45b7885a..6053f9b873 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> -# Last change: 2019 Sep 04 +# Last change: 2019 Sep 27 # # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK @@ -318,7 +318,7 @@ SRC = arabic.c arglist.c autocmd.c beval.c blob.c blowfish.c buffer.c \ indent.c insexpand.c json.c list.c main.c map.c mark.c menu.c mbyte.c \ memfile.c memline.c message.c misc1.c misc2.c mouse.c move.c normal.c \ ops.c \ - option.c optionstr.c popupmnu.c popupwin.c profiler.c quickfix.c \ + option.c optionstr.c popupmenu.c popupwin.c profiler.c quickfix.c \ regexp.c register.c scriptfile.c \ search.c session.c sha256.c sign.c spell.c spellfile.c spellsuggest.c \ syntax.c tag.c \ @@ -340,7 +340,7 @@ OBJ = arabic.obj arglist.obj autocmd.obj beval.obj blob.obj blowfish.obj \ map.obj mark.obj menu.obj memfile.obj memline.obj message.obj \ misc1.obj misc2.obj mouse.obj move.obj mbyte.obj normal.obj ops.obj \ option.obj \ - optionstr.obj popupmnu.obj popupwin.obj profiler.obj quickfix.obj \ + optionstr.obj popupmenu.obj popupwin.obj profiler.obj quickfix.obj \ regexp.obj register.obj scriptfile.obj \ search.obj session.obj sha256.obj sign.obj spell.obj spellfile.obj \ spellsuggest.obj syntax.obj tag.obj term.obj termlib.obj testing.obj \ @@ -737,7 +737,7 @@ pathdef.obj : pathdef.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h -popupmnu.obj : popupmnu.c vim.h [.auto]config.h feature.h os_unix.h \ +popupmenu.obj : popupmenu.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h diff --git a/src/Makefile b/src/Makefile index 0f949a8912..75085ee4b3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1638,7 +1638,7 @@ BASIC_SRC = \ optionstr.c \ os_unix.c \ auto/pathdef.c \ - popupmnu.c \ + popupmenu.c \ popupwin.c \ profiler.c \ pty.c \ @@ -1774,7 +1774,7 @@ OBJ_COMMON = \ objects/optionstr.o \ objects/os_unix.o \ objects/pathdef.o \ - objects/popupmnu.o \ + objects/popupmenu.o \ objects/popupwin.o \ objects/profiler.o \ objects/pty.o \ @@ -1935,7 +1935,7 @@ PRO_AUTO = \ optionstr.pro \ os_mac_conv.pro \ os_unix.pro \ - popupmnu.pro \ + popupmenu.pro \ popupwin.pro \ profiler.pro \ pty.pro \ @@ -3341,8 +3341,8 @@ objects/winclip.o: winclip.c objects/pathdef.o: auto/pathdef.c $(CCC) -o $@ auto/pathdef.c -objects/popupmnu.o: popupmnu.c - $(CCC) -o $@ popupmnu.c +objects/popupmenu.o: popupmenu.c + $(CCC) -o $@ popupmenu.c objects/popupwin.o: popupwin.c $(CCC) -o $@ popupwin.c @@ -3823,7 +3823,7 @@ objects/pathdef.o: auto/pathdef.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h -objects/popupmnu.o: popupmnu.c vim.h protodef.h auto/config.h feature.h os_unix.h \ +objects/popupmenu.o: popupmenu.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h diff --git a/src/README.md b/src/README.md index b08f0b4931..8d21b5f679 100644 --- a/src/README.md +++ b/src/README.md @@ -58,7 +58,7 @@ mouse.c | handling the mouse ops.c | handling operators ("d", "y", "p") option.c | options optionstr.c | handling string options -popupmnu.c | popup menu +popupmenu.c | popup menu popupwin.c | popup window profiler.c | vim script profiler quickfix.c | quickfix commands (":make", ":cn") diff --git a/src/dosinst.c b/src/dosinst.c index 0ea879a390..2ff08420e1 100644 --- a/src/dosinst.c +++ b/src/dosinst.c @@ -14,7 +14,7 @@ */ /* - * Include common code for dosinst.c and uninstal.c. + * Include common code for dosinst.c and uninstall.c. */ #define DOSINST #include "dosinst.h" @@ -1686,7 +1686,7 @@ install_registry(void) /* For the NSIS installer use the generated uninstaller. */ if (interactive) - sprintf(uninstall_string, "%s\\uninstal.exe", installdir); + sprintf(uninstall_string, "%s\\uninstall.exe", installdir); else sprintf(uninstall_string, "%s\\uninstall-gui.exe", installdir); @@ -1962,7 +1962,7 @@ install_start_menu(int idx) return; } if (build_shortcut("Uninstall", - interactive ? "uninstal.exe" : "uninstall-gui.exe", "", + interactive ? "uninstall.exe" : "uninstall-gui.exe", "", VIM_STARTMENU, installdir) == FAIL) return; /* For Windows NT the working dir of the vimtutor.bat must be right, diff --git a/src/dosinst.h b/src/dosinst.h index 7cb4139a09..a83bb0839f 100644 --- a/src/dosinst.h +++ b/src/dosinst.h @@ -7,7 +7,7 @@ * See README.txt for an overview of the Vim source code. */ /* - * dosinst.h: Common code for dosinst.c and uninstal.c + * dosinst.h: Common code for dosinst.c and uninstall.c */ /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ diff --git a/src/popupmnu.c b/src/popupmenu.c index da70c5fdc1..846dbc264d 100644 --- a/src/popupmnu.c +++ b/src/popupmenu.c @@ -8,7 +8,7 @@ */ /* - * popupmnu.c: Popup menu (PUM) + * popupmenu.c: Popup menu (PUM) */ #include "vim.h" diff --git a/src/proto.h b/src/proto.h index 6d3b83deab..4c419c6fb4 100644 --- a/src/proto.h +++ b/src/proto.h @@ -182,7 +182,7 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void # include "ops.pro" # include "option.pro" # include "optionstr.pro" -# include "popupmnu.pro" +# include "popupmenu.pro" # if defined(FEAT_PROFILE) || defined(FEAT_RELTIME) # include "profiler.pro" # endif diff --git a/src/proto/popupmenu.pro b/src/proto/popupmenu.pro new file mode 100644 index 0000000000..c01966396c --- /dev/null +++ b/src/proto/popupmenu.pro @@ -0,0 +1,18 @@ +/* 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); +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/proto/popupmnu.pro b/src/proto/popupmnu.pro index c01966396c..f5b6c0c90f 100644 --- a/src/proto/popupmnu.pro +++ b/src/proto/popupmnu.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/uninstal.c b/src/uninstall.c index 7b7e3efe4b..94d39572cf 100644 --- a/src/uninstal.c +++ b/src/uninstall.c @@ -8,7 +8,7 @@ */ /* - * uninstal.c: Minimalistic uninstall program for Vim on MS-Windows + * uninstall.c: Minimalistic uninstall program for Vim on MS-Windows * Removes: * - the "Edit with Vim" popup menu entry * - the Vim "Open With..." popup menu entry @@ -17,7 +17,7 @@ * - the Vim entry in the Start Menu */ -/* Include common code for dosinst.c and uninstal.c. */ +/* Include common code for dosinst.c and uninstall.c. */ #include "dosinst.h" /* diff --git a/src/version.c b/src/version.c index fa78a08e79..fa4e956b20 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 */ /**/ + 2082, +/**/ 2081, /**/ 2080, |