Skip to content

Commit 30e8e73

Browse files
brammoolbrammool
committed
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.
1 parent 46a426c commit 30e8e73

19 files changed

+76
-56
lines changed

‎Filelist

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ SRC_ALL = \
9292
src/option.h \
9393
src/optiondefs.h \
9494
src/optionstr.c \
95-
src/popupmnu.c \
95+
src/popupmenu.c \
9696
src/popupwin.c \
9797
src/profiler.c \
9898
src/quickfix.c \
@@ -241,7 +241,7 @@ SRC_ALL = \
241241
src/proto/ops.pro \
242242
src/proto/option.pro \
243243
src/proto/optionstr.pro \
244-
src/proto/popupmnu.pro \
244+
src/proto/popupmenu.pro \
245245
src/proto/popupwin.pro \
246246
src/proto/profiler.pro \
247247
src/proto/quickfix.pro \
@@ -517,7 +517,7 @@ SRC_DOS = \
517517
src/testdir/Make_dos.mak \
518518
src/testdir/Make_ming.mak \
519519
src/testdir/dos.vim \
520-
src/uninstal.c \
520+
src/uninstall.c \
521521
src/vim.def \
522522
src/vim.rc \
523523
src/vimio.h \
@@ -532,7 +532,7 @@ SRC_DOS = \
532532
nsis/gvim_version.nsh \
533533
nsis/README.txt \
534534
nsis/lang/*.nsi \
535-
uninstal.txt \
535+
uninstall.txt \
536536
src/VisVim/Commands.cpp \
537537
src/VisVim/Commands.h \
538538
src/VisVim/DSAddIn.cpp \
@@ -852,7 +852,7 @@ BIN_AMI = \
852852
# files for DOS binary (also in extra archive)
853853
BIN_DOS = \
854854
README_bindos.txt \
855-
uninstal.txt \
855+
uninstall.txt \
856856

857857
# files for Win32 OLE binary (also in extra archive)
858858
BIN_OLE = \

‎Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ MINOR = 1
165165
# xxd/xxd.exe to xxdw32.exe
166166
# vim.pdb to vimw32.pdb
167167
# install.exe to installw32.exe
168-
# uninstal.exe to uninstalw32.exe
168+
# uninstall.exe to uninstallw32.exe
169169
# Win32 GUI version build:
170170
# - > cd src
171171
# > nmake -f Make_mvc.mak GUI=yes
@@ -175,7 +175,7 @@ MINOR = 1
175175
# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
176176
# - Move gvim.pdb to here.
177177
# - Copy "GvimExt/gvimext.dll" to here.
178-
# - Delete vimrun.exe, install.exe and uninstal.exe.
178+
# - Delete vimrun.exe, install.exe and uninstall.exe.
179179
# Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
180180
# - Install the interfaces you want, see src/INSTALLpc.txt
181181
# Adjust bigvim.bat to match the version of each interface you want.
@@ -188,7 +188,7 @@ MINOR = 1
188188
# - check the output.
189189
# - Rename "gvim.exe" to "gvim_ole.exe".
190190
# - Rename gvim.pdb to "gvim_ole.pdb".
191-
# - Delete install.exe and uninstal.exe.
191+
# - Delete install.exe and uninstall.exe.
192192
# Create the archives:
193193
# - Copy all the "*.exe" files to where this Makefile is.
194194
# - Copy all the "*.pdb" files to where this Makefile is.
@@ -197,7 +197,7 @@ MINOR = 1
197197
# NSIS self installing exe:
198198
# - To get NSIS see http://nsis.sourceforge.net
199199
# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
200-
# uninstalw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
200+
# uninstallw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
201201
# above.
202202
# - copy these files (get them from a binary archive or build them):
203203
# gvimext.dll in src/GvimExt
@@ -518,7 +518,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
518518
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
519519
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
520520
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
521-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
521+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
522522
mkdir dist/vim/$(VIMRTDIR)/GvimExt32
523523
cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
524524
mkdir dist/vim/$(VIMRTDIR)/GvimExt64
@@ -539,7 +539,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
539539
cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
540540
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
541541
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
542-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
542+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
543543
cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
544544
cp vimw32.pdb dist/vim$(VERSION)w32.pdb
545545

@@ -557,7 +557,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
557557
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
558558
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
559559
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
560-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
560+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
561561
cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
562562
cp README_ole.txt dist/vim/$(VIMRTDIR)
563563
cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll

‎nsis/gvim.nsi

+3-3
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ Section "$(str_section_exe)" id_section_exe
341341
File ${VIMSRC}\vim${BIT}.dll
342342
!endif
343343
File /oname=install.exe ${VIMSRC}\installw32.exe
344-
File /oname=uninstal.exe ${VIMSRC}\uninstalw32.exe
344+
File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
345345
File ${VIMSRC}\vimrun.exe
346346
File /oname=tee.exe ${VIMSRC}\teew32.exe
347347
File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
348348
File ..\vimtutor.bat
349349
File ..\README.txt
350-
File ..\uninstal.txt
350+
File ..\uninstall.txt
351351
File ${VIMRT}\*.vim
352352
File ${VIMRT}\rgb.txt
353353

@@ -955,7 +955,7 @@ Section "un.$(str_unsection_register)" id_unsection_register
955955

956956
# delete the context menu entry and batch files
957957
DetailPrint "$(str_msg_unregistering)"
958-
nsExec::Exec "$0\uninstal.exe -nsis"
958+
nsExec::Exec "$0\uninstall.exe -nsis"
959959
Pop $3
960960

961961
# We may have been put to the background when uninstall did something.

‎src/INSTALLpc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ correct directory structure.
10231023
Move the "vim81" subdirectory into the subdirectory where you want Vim
10241024
to be installed. Typically, this subdirectory will be named "vim".
10251025
If you already have a "vim81" subdirectory in "vim", delete it first
1026-
by running its uninstal.exe program.
1026+
by running its uninstall.exe program.
10271027

10281028
E. Install Vim
10291029
---------------

‎src/Make_cyg_ming.mak

+5-5
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ OBJ = \
764764
$(OUTDIR)/os_mswin.o \
765765
$(OUTDIR)/os_win32.o \
766766
$(OUTDIR)/pathdef.o \
767-
$(OUTDIR)/popupmnu.o \
767+
$(OUTDIR)/popupmenu.o \
768768
$(OUTDIR)/popupwin.o \
769769
$(OUTDIR)/profiler.o \
770770
$(OUTDIR)/quickfix.o \
@@ -1015,16 +1015,16 @@ ifeq (yes, $(MAP))
10151015
LFLAGS += -Wl,-Map=$(TARGET).map
10161016
endif
10171017

1018-
all: $(MAIN_TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstal.exe GvimExt/gvimext.dll
1018+
all: $(MAIN_TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstall.exe GvimExt/gvimext.dll
10191019

10201020
vimrun.exe: vimrun.c
10211021
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIB)
10221022

10231023
install.exe: dosinst.c
10241024
$(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid
10251025

1026-
uninstal.exe: uninstal.c
1027-
$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIB) -lole32
1026+
uninstall.exe: uninstall.c
1027+
$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
10281028

10291029
ifeq ($(VIMDLL),yes)
10301030
$(TARGET): $(OUTDIR) $(OBJ)
@@ -1068,7 +1068,7 @@ clean:
10681068
-$(DEL) $(OUTDIR)$(DIRSLASH)*.res
10691069
-$(DEL) $(OUTDIR)$(DIRSLASH)pathdef.c
10701070
-rmdir $(OUTDIR)
1071-
-$(DEL) $(MAIN_TARGET) vimrun.exe install.exe uninstal.exe
1071+
-$(DEL) $(MAIN_TARGET) vimrun.exe install.exe uninstall.exe
10721072
ifdef PERL
10731073
-$(DEL) if_perl.c
10741074
-$(DEL) auto$(DIRSLASH)if_perl.c

‎src/Make_morph.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ SRC = arabic.c \
8181
option.c \
8282
optionstr.c \
8383
os_amiga.c \
84-
popupmnu.c \
84+
popupmenu.c \
8585
profiler.c \
8686
quickfix.c \
8787
regexp.c \

‎src/Make_mvc.mak

+7-7
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ OBJ = \
771771
$(OUTDIR)\os_mswin.obj \
772772
$(OUTDIR)\os_win32.obj \
773773
$(OUTDIR)\pathdef.obj \
774-
$(OUTDIR)\popupmnu.obj \
774+
$(OUTDIR)\popupmenu.obj \
775775
$(OUTDIR)\popupwin.obj \
776776
$(OUTDIR)\profiler.obj \
777777
$(OUTDIR)\quickfix.obj \
@@ -1280,7 +1280,7 @@ MAIN_TARGET = $(VIM).exe
12801280
all: $(MAIN_TARGET) \
12811281
vimrun.exe \
12821282
install.exe \
1283-
uninstal.exe \
1283+
uninstall.exe \
12841284
xxd/xxd.exe \
12851285
tee/tee.exe \
12861286
GvimExt/gvimext.dll
@@ -1339,8 +1339,8 @@ install.exe: dosinst.c
13391339
- if exist install.exe del install.exe
13401340
ren dosinst.exe install.exe
13411341

1342-
uninstal.exe: uninstal.c
1343-
$(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib \
1342+
uninstall.exe: uninstall.c
1343+
$(CC) /nologo -DNDEBUG -DWIN32 uninstall.c shell32.lib advapi32.lib \
13441344
-link -subsystem:$(SUBSYSTEM_TOOLS)
13451345

13461346
vimrun.exe: vimrun.c
@@ -1387,7 +1387,7 @@ clean:
13871387
!endif
13881388
- if exist vimrun.exe del vimrun.exe
13891389
- if exist install.exe del install.exe
1390-
- if exist uninstal.exe del uninstal.exe
1390+
- if exist uninstall.exe del uninstall.exe
13911391
- if exist if_perl.c del if_perl.c
13921392
- if exist auto\if_perl.c del auto\if_perl.c
13931393
- if exist dimm.h del dimm.h
@@ -1643,7 +1643,7 @@ $(OUTDIR)/os_w32exeg.obj: $(OUTDIR) os_w32exe.c $(INCL)
16431643
$(OUTDIR)/pathdef.obj: $(OUTDIR) $(PATHDEF_SRC) $(INCL)
16441644
$(CC) $(CFLAGS_OUTDIR) $(PATHDEF_SRC)
16451645

1646-
$(OUTDIR)/popupmnu.obj: $(OUTDIR) popupmnu.c $(INCL)
1646+
$(OUTDIR)/popupmenu.obj: $(OUTDIR) popupmenu.c $(INCL)
16471647

16481648
$(OUTDIR)/popupwin.obj: $(OUTDIR) popupwin.c $(INCL)
16491649

@@ -1841,7 +1841,7 @@ proto.h: \
18411841
proto/os_mswin.pro \
18421842
proto/winclip.pro \
18431843
proto/os_win32.pro \
1844-
proto/popupmnu.pro \
1844+
proto/popupmenu.pro \
18451845
proto/popupwin.pro \
18461846
proto/profiler.pro \
18471847
proto/quickfix.pro \

‎src/Make_vms.mms

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Makefile for Vim on OpenVMS
33
#
44
# Maintainer: Zoltan Arpadffy <[email protected]>
5-
# Last change: 2019 Sep 04
5+
# Last change: 2019 Sep 27
66
#
77
# This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
88
# with MMS and MMK
@@ -318,7 +318,7 @@ SRC = arabic.c arglist.c autocmd.c beval.c blob.c blowfish.c buffer.c \
318318
indent.c insexpand.c json.c list.c main.c map.c mark.c menu.c mbyte.c \
319319
memfile.c memline.c message.c misc1.c misc2.c mouse.c move.c normal.c \
320320
ops.c \
321-
option.c optionstr.c popupmnu.c popupwin.c profiler.c quickfix.c \
321+
option.c optionstr.c popupmenu.c popupwin.c profiler.c quickfix.c \
322322
regexp.c register.c scriptfile.c \
323323
search.c session.c sha256.c sign.c spell.c spellfile.c spellsuggest.c \
324324
syntax.c tag.c \
@@ -340,7 +340,7 @@ OBJ = arabic.obj arglist.obj autocmd.obj beval.obj blob.obj blowfish.obj \
340340
map.obj mark.obj menu.obj memfile.obj memline.obj message.obj \
341341
misc1.obj misc2.obj mouse.obj move.obj mbyte.obj normal.obj ops.obj \
342342
option.obj \
343-
optionstr.obj popupmnu.obj popupwin.obj profiler.obj quickfix.obj \
343+
optionstr.obj popupmenu.obj popupwin.obj profiler.obj quickfix.obj \
344344
regexp.obj register.obj scriptfile.obj \
345345
search.obj session.obj sha256.obj sign.obj spell.obj spellfile.obj \
346346
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 \
737737
ascii.h keymap.h term.h macros.h structs.h regexp.h \
738738
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
739739
globals.h
740-
popupmnu.obj : popupmnu.c vim.h [.auto]config.h feature.h os_unix.h \
740+
popupmenu.obj : popupmenu.c vim.h [.auto]config.h feature.h os_unix.h \
741741
ascii.h keymap.h term.h macros.h structs.h regexp.h \
742742
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
743743
globals.h

‎src/Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ BASIC_SRC = \
16381638
optionstr.c \
16391639
os_unix.c \
16401640
auto/pathdef.c \
1641-
popupmnu.c \
1641+
popupmenu.c \
16421642
popupwin.c \
16431643
profiler.c \
16441644
pty.c \
@@ -1774,7 +1774,7 @@ OBJ_COMMON = \
17741774
objects/optionstr.o \
17751775
objects/os_unix.o \
17761776
objects/pathdef.o \
1777-
objects/popupmnu.o \
1777+
objects/popupmenu.o \
17781778
objects/popupwin.o \
17791779
objects/profiler.o \
17801780
objects/pty.o \
@@ -1935,7 +1935,7 @@ PRO_AUTO = \
19351935
optionstr.pro \
19361936
os_mac_conv.pro \
19371937
os_unix.pro \
1938-
popupmnu.pro \
1938+
popupmenu.pro \
19391939
popupwin.pro \
19401940
profiler.pro \
19411941
pty.pro \
@@ -3341,8 +3341,8 @@ objects/winclip.o: winclip.c
33413341
objects/pathdef.o: auto/pathdef.c
33423342
$(CCC) -o $@ auto/pathdef.c
33433343

3344-
objects/popupmnu.o: popupmnu.c
3345-
$(CCC) -o $@ popupmnu.c
3344+
objects/popupmenu.o: popupmenu.c
3345+
$(CCC) -o $@ popupmenu.c
33463346

33473347
objects/popupwin.o: popupwin.c
33483348
$(CCC) -o $@ popupwin.c
@@ -3823,7 +3823,7 @@ objects/pathdef.o: auto/pathdef.c vim.h protodef.h auto/config.h feature.h \
38233823
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
38243824
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
38253825
proto.h globals.h
3826-
objects/popupmnu.o: popupmnu.c vim.h protodef.h auto/config.h feature.h os_unix.h \
3826+
objects/popupmenu.o: popupmenu.c vim.h protodef.h auto/config.h feature.h os_unix.h \
38273827
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
38283828
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
38293829
proto.h globals.h

‎src/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ mouse.c | handling the mouse
5858
ops.c | handling operators ("d", "y", "p")
5959
option.c | options
6060
optionstr.c | handling string options
61-
popupmnu.c | popup menu
61+
popupmenu.c | popup menu
6262
popupwin.c | popup window
6363
profiler.c | vim script profiler
6464
quickfix.c | quickfix commands (":make", ":cn")

‎src/dosinst.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
/*
17-
* Include common code for dosinst.c and uninstal.c.
17+
* Include common code for dosinst.c and uninstall.c.
1818
*/
1919
#define DOSINST
2020
#include "dosinst.h"
@@ -1686,7 +1686,7 @@ install_registry(void)
16861686

16871687
/* For the NSIS installer use the generated uninstaller. */
16881688
if (interactive)
1689-
sprintf(uninstall_string, "%s\\uninstal.exe", installdir);
1689+
sprintf(uninstall_string, "%s\\uninstall.exe", installdir);
16901690
else
16911691
sprintf(uninstall_string, "%s\\uninstall-gui.exe", installdir);
16921692

@@ -1962,7 +1962,7 @@ install_start_menu(int idx)
19621962
return;
19631963
}
19641964
if (build_shortcut("Uninstall",
1965-
interactive ? "uninstal.exe" : "uninstall-gui.exe", "",
1965+
interactive ? "uninstall.exe" : "uninstall-gui.exe", "",
19661966
VIM_STARTMENU, installdir) == FAIL)
19671967
return;
19681968
/* For Windows NT the working dir of the vimtutor.bat must be right,

‎src/dosinst.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* See README.txt for an overview of the Vim source code.
88
*/
99
/*
10-
* dosinst.h: Common code for dosinst.c and uninstal.c
10+
* dosinst.h: Common code for dosinst.c and uninstall.c
1111
*/
1212

1313
/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */

‎src/popupmnu.c ‎src/popupmenu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
/*
11-
* popupmnu.c: Popup menu (PUM)
11+
* popupmenu.c: Popup menu (PUM)
1212
*/
1313
#include "vim.h"
1414

‎src/proto.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
182182
# include "ops.pro"
183183
# include "option.pro"
184184
# include "optionstr.pro"
185-
# include "popupmnu.pro"
185+
# include "popupmenu.pro"
186186
# if defined(FEAT_PROFILE) || defined(FEAT_RELTIME)
187187
# include "profiler.pro"
188188
# endif

0 commit comments

Comments
 (0)