opensourcemirror
/
Vim
mirror of https://github.com/vim/vim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

patch 8.1.2082: some files have a weird name to fit in 8.3 characters 

Problem:    Some files have a weird name to fit in 8.3 characters.
Solution:   Use a nicer names.
This commit is contained in:
Bram Moolenaar 2019-09-27 13:08:36 +02:00
parent 46a426c9ac
commit 30e8e73506
19 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Filelist
View File

@ -92,7 +92,7 @@ SRC_ALL = \
src/option.h \
src/optiondefs.h \
src/optionstr.c \
src/popupmnu.c \
src/popupmenu.c \
src/popupwin.c \
src/profiler.c \
src/quickfix.c \
@ -241,7 +241,7 @@ SRC_ALL = \
src/proto/ops.pro \
src/proto/option.pro \
src/proto/optionstr.pro \
src/proto/popupmnu.pro \
src/proto/popupmenu.pro \
src/proto/popupwin.pro \
src/proto/profiler.pro \
src/proto/quickfix.pro \
@ -517,7 +517,7 @@ SRC_DOS = \
src/testdir/Make_dos.mak \
src/testdir/Make_ming.mak \
src/testdir/dos.vim \
src/uninstal.c \
src/uninstall.c \
src/vim.def \
src/vim.rc \
src/vimio.h \
@ -532,7 +532,7 @@ SRC_DOS = \
nsis/gvim_version.nsh \
nsis/README.txt \
nsis/lang/*.nsi \
uninstal.txt \
uninstall.txt \
src/VisVim/Commands.cpp \
src/VisVim/Commands.h \
src/VisVim/DSAddIn.cpp \
@ -852,7 +852,7 @@ BIN_AMI = \
# files for DOS binary (also in extra archive)
BIN_DOS = \
README_bindos.txt \
uninstal.txt \
uninstall.txt \
# files for Win32 OLE binary (also in extra archive)
BIN_OLE = \

14
Makefile
View File

@ -165,7 +165,7 @@ MINOR = 1
# xxd/xxd.exe to xxdw32.exe
# vim.pdb to vimw32.pdb
# install.exe to installw32.exe
# uninstal.exe to uninstalw32.exe
# uninstall.exe to uninstallw32.exe
# Win32 GUI version build:
# - > cd src
# > nmake -f Make_mvc.mak GUI=yes
@ -175,7 +175,7 @@ MINOR = 1
# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
# - Move gvim.pdb to here.
# - Copy "GvimExt/gvimext.dll" to here.
# - Delete vimrun.exe, install.exe and uninstal.exe.
# - Delete vimrun.exe, install.exe and uninstall.exe.
# Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
# - Install the interfaces you want, see src/INSTALLpc.txt
# Adjust bigvim.bat to match the version of each interface you want.
@ -188,7 +188,7 @@ MINOR = 1
# - check the output.
# - Rename "gvim.exe" to "gvim_ole.exe".
# - Rename gvim.pdb to "gvim_ole.pdb".
# - Delete install.exe and uninstal.exe.
# - Delete install.exe and uninstall.exe.
# Create the archives:
# - Copy all the "*.exe" files to where this Makefile is.
# - Copy all the "*.pdb" files to where this Makefile is.
@ -197,7 +197,7 @@ MINOR = 1
# NSIS self installing exe:
# - To get NSIS see http://nsis.sourceforge.net
# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
# uninstalw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
# uninstallw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
# above.
# - copy these files (get them from a binary archive or build them):
# gvimext.dll in src/GvimExt
@ -518,7 +518,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
mkdir dist/vim/$(VIMRTDIR)/GvimExt32
cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
mkdir dist/vim/$(VIMRTDIR)/GvimExt64
@ -539,7 +539,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
cp vimw32.pdb dist/vim$(VERSION)w32.pdb
@ -557,7 +557,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
cp README_ole.txt dist/vim/$(VIMRTDIR)
cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll

6
nsis/gvim.nsi
View File

@ -341,13 +341,13 @@ Section "$(str_section_exe)" id_section_exe
File ${VIMSRC}\vim${BIT}.dll
!endif
File /oname=install.exe ${VIMSRC}\installw32.exe
File /oname=uninstal.exe ${VIMSRC}\uninstalw32.exe
File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
File ${VIMSRC}\vimrun.exe
File /oname=tee.exe ${VIMSRC}\teew32.exe
File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
File ..\vimtutor.bat
File ..\README.txt
File ..\uninstal.txt
File ..\uninstall.txt
File ${VIMRT}\*.vim
File ${VIMRT}\rgb.txt
@ -955,7 +955,7 @@ Section "un.$(str_unsection_register)" id_unsection_register
# delete the context menu entry and batch files
DetailPrint "$(str_msg_unregistering)"
nsExec::Exec "$0\uninstal.exe -nsis"
nsExec::Exec "$0\uninstall.exe -nsis"
Pop $3
# We may have been put to the background when uninstall did something.

2
src/INSTALLpc.txt
View File

@ -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
---------------

10
src/Make_cyg_ming.mak
View File

@ -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

2
src/Make_morph.mak
View File

@ -81,7 +81,7 @@ SRC = arabic.c \
option.c \
optionstr.c \
os_amiga.c \
popupmnu.c \
popupmenu.c \
profiler.c \
quickfix.c \
regexp.c \

14
src/Make_mvc.mak
View File

@ -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 \

8
src/Make_vms.mms
View File

@ -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

12
src/Makefile
View File

@ -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

2
src/README.md
View File

@ -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")

6
src/dosinst.c
View File

@ -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,

2
src/dosinst.h
View File

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

2
src/popupmnu.c → src/popupmenu.c
View File

@ -8,7 +8,7 @@
*/
/*
* popupmnu.c: Popup menu (PUM)
* popupmenu.c: Popup menu (PUM)
*/
#include "vim.h"

2
src/proto.h
View File

@ -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

18
src/proto/popupmenu.pro Normal file
View File

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

2
src/proto/popupmnu.pro
View File

@ -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);

4
src/uninstal.c → src/uninstall.c
View File

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

2
src/version.c
View File

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

14
uninstal.txt → uninstall.txt
View File

@ -7,32 +7,32 @@ There are three ways to remove Vim:
executable. This has a minimal number of questions. It can delete
everything that was installed. This also unregisters the VisVim.dll.
2. With uninstal.exe.
2. With uninstall.exe.
This removes most installed items, but does not delete the files you
unpacked.
3. By hand.
This is a bit more work, but you can decide exactly what you want to
remove. For uninstalling the "Edit with Vim" popup menu entry you still
have to use uninstal.exe.
have to use uninstall.exe.
It's recommended to use the method that matches with how you installed Vim.
Thus if you installed Vim by hand, delete it by hand.
The first two methods should be available from the Add/Remove software window
and the Vim entry in the Start menu. If these have been removed already, find
"uninstall-gui.exe" or "uninstal.exe" in the Vim directory.
"uninstall-gui.exe" or "uninstall.exe" in the Vim directory.
Running these programs should be self-explanatory. Carefully read the
messages to avoid deleting something you want to keep.
Here are guidelines for removing Vim by hand:
1. Remove the "Edit with Vim" popup menu entry, if it exists. This is done by
running the uninstal.exe program. It removes the registry entries for the
"Edit with Vim" popup menu entry. You only need to run uninstal.exe when
you have installed the menu entry. You can also run uninstal.exe from the
running the uninstall.exe program. It removes the registry entries for the
"Edit with Vim" popup menu entry. You only need to run uninstall.exe when
you have installed the menu entry. You can also run uninstall.exe from the
Control panel with the Add/Remove programs application.
Note that uninstal.exe offers you the option to uninstal other items. You
Note that uninstall.exe offers you the option to uninstall other items. You
can skip this.
2. Only if you have used the OLE version of gvim: Remove the registration of