Re: Patch 8.1.2082
Ken Takata wrote: > 2019/9/27 Fri 20:09:37 UTC+9 Bram Moolenaar wrote: > > > > > > Patch 8.1.2082 > > Problem:Some files have a weird name to fit in 8.3 characters. > > Solution: Use a nicer names. > > Files:Filelist, Makefile, src/popupmnu.c, src/popupmenu.c, > > src/proto/popupmnu.pro, src/proto/popupmenu.pro, > > src/Make_cyg_ming.mak, src/Make_morph.mak, src/Make_mvc.mak, > > src/Make_vms.mms, src/Makefile, src/proto.h, src/README.md, > > src/uninstal.c, src/uninstall.c, uninstal.txt, uninstall.txt, > > nsis/gvim.nsi, src/INSTALLpc.txt, src/dosinst.c, src/dosinst.h > > > > > > It looks that your change is not enough. Please check the attached patch. Thanks! -- CUSTOMER: You're not fooling anyone y'know. Look, isn't there something you can do? DEAD PERSON: I feel happy... I feel happy. [whop] CUSTOMER: Ah, thanks very much. MORTICIAN:Not at all. See you on Thursday. CUSTOMER: Right. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- b...@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/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/201909271220.x8RCK49o026968%40masaka.moolenaar.net.
Re: Patch 8.1.2082
Hi Bram,
2019/9/27 Fri 20:09:37 UTC+9 Bram Moolenaar wrote:
>
>
> Patch 8.1.2082
> Problem:Some files have a weird name to fit in 8.3 characters.
> Solution: Use a nicer names.
> Files:Filelist, Makefile, src/popupmnu.c, src/popupmenu.c,
> src/proto/popupmnu.pro, src/proto/popupmenu.pro,
> src/Make_cyg_ming.mak, src/Make_morph.mak, src/Make_mvc.mak,
> src/Make_vms.mms, src/Makefile, src/proto.h, src/README.md,
> src/uninstal.c, src/uninstall.c, uninstal.txt, uninstall.txt,
> nsis/gvim.nsi, src/INSTALLpc.txt, src/dosinst.c, src/dosinst.h
>
>
It looks that your change is not enough. Please check the attached patch.
Regards,
Ken Takata
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/a303d4da-77cc-4ed3-9d72-584a36735166%40googlegroups.com.
# HG changeset patch
# Parent 427fa39e0797cb63d0af15739fc79ff2d8f393b4
diff --git a/nsis/README.txt b/nsis/README.txt
--- a/nsis/README.txt
+++ b/nsis/README.txt
@@ -14,7 +14,7 @@ 2. Go to the src directory and build:
gvim.exe (the OLE version),
vimrun.exe,
install.exe,
- uninstal.exe,
+ uninstall.exe,
tee/tee.exe,
xxd/xxd.exe,
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -171,14 +171,14 @@ 2. Add these keys:
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
+ 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 "uninstal.exe" program can do this for you. You
-can also use the entry in the Windows standard "Add/Remove Programs" list.
+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
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -480,9 +480,9 @@ probably contains your vimrc file and ot
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.
+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
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -17,4 +17,4 @@ REGEDIT4
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1]
"DisplayName"="Vim 8.1: Edit with Vim popup menu entry"
- "UninstallString"="uninstal.exe"
+ "UninstallString"="uninstall.exe"
diff --git a/src/GvimExt/README.txt b/src/GvimExt/README.txt
--- a/src/GvimExt/README.txt
+++ b/src/GvimExt/README.txt
@@ -11,7 +11,7 @@ registry entries.
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
+- 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.
diff --git a/src/proto/popupmenu.pro b/src/proto/popupmenu.pro
--- a/src/proto/popupmenu.pro
+++ b/src/proto/popupmenu.pro
@@ -1
Patch 8.1.2082
Patch 8.1.2082 Problem:Some files have a weird name to fit in 8.3 characters. Solution: Use a nicer names. Files: Filelist, Makefile, src/popupmnu.c, src/popupmenu.c, src/proto/popupmnu.pro, src/proto/popupmenu.pro, src/Make_cyg_ming.mak, src/Make_morph.mak, src/Make_mvc.mak, src/Make_vms.mms, src/Makefile, src/proto.h, src/README.md, src/uninstal.c, src/uninstall.c, uninstal.txt, uninstall.txt, nsis/gvim.nsi, src/INSTALLpc.txt, src/dosinst.c, src/dosinst.h *** ../vim-8.1.2081/Filelist2019-09-27 12:41:35.007573135 +0200 --- Filelist2019-09-27 12:56:36.105532072 +0200 *** *** 92,98 src/option.h \ src/optiondefs.h \ src/optionstr.c \ ! src/popupmnu.c \ src/popupwin.c \ src/profiler.c \ src/quickfix.c \ --- 92,98 src/option.h \ src/optiondefs.h \ src/optionstr.c \ ! src/popupmenu.c \ src/popupwin.c \ src/profiler.c \ src/quickfix.c \ *** *** 241,247 src/proto/ops.pro \ src/proto/option.pro \ src/proto/optionstr.pro \ ! src/proto/popupmnu.pro \ src/proto/popupwin.pro \ src/proto/profiler.pro \ src/proto/quickfix.pro \ --- 241,247 src/proto/ops.pro \ src/proto/option.pro \ src/proto/optionstr.pro \ ! src/proto/popupmenu.pro \ src/proto/popupwin.pro \ src/proto/profiler.pro \ src/proto/quickfix.pro \ *** *** 517,523 src/testdir/Make_dos.mak \ src/testdir/Make_ming.mak \ src/testdir/dos.vim \ ! src/uninstal.c \ src/vim.def \ src/vim.rc \ src/vimio.h \ --- 517,523 src/testdir/Make_dos.mak \ src/testdir/Make_ming.mak \ src/testdir/dos.vim \ ! src/uninstall.c \ src/vim.def \ src/vim.rc \ src/vimio.h \ *** *** 532,538 nsis/gvim_version.nsh \ nsis/README.txt \ nsis/lang/*.nsi \ ! uninstal.txt \ src/VisVim/Commands.cpp \ src/VisVim/Commands.h \ src/VisVim/DSAddIn.cpp \ --- 532,538 nsis/gvim_version.nsh \ nsis/README.txt \ nsis/lang/*.nsi \ ! uninstall.txt \ src/VisVim/Commands.cpp \ src/VisVim/Commands.h \ src/VisVim/DSAddIn.cpp \ *** *** 852,858 # files for DOS binary (also in extra archive) BIN_DOS = \ README_bindos.txt \ ! uninstal.txt \ # files for Win32 OLE binary (also in extra archive) BIN_OLE = \ --- 852,858 # files for DOS binary (also in extra archive) BIN_DOS = \ README_bindos.txt \ ! uninstall.txt \ # files for Win32 OLE binary (also in extra archive) BIN_OLE = \ *** ../vim-8.1.2081/Makefile2019-04-27 17:57:28.079905467 +0200 --- Makefile2019-09-27 12:59:32.192548655 +0200 *** *** 165,171 # xxd/xxd.exe to xxdw32.exe # vim.pdb to vimw32.pdb # install.exe to installw32.exe ! # uninstal.exe to uninstalw32.exe # Win32 GUI version build: # - > cd src # > nmake -f Make_mvc.mak GUI=yes --- 165,171 # xxd/xxd.exe to xxdw32.exe # vim.pdb to vimw32.pdb # install.exe to installw32.exe ! # uninstall.exe to uninstallw32.exe # Win32 GUI version build: # - > cd src # > nmake -f Make_mvc.mak GUI=yes *** *** 175,181 # - 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. # 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. --- 175,181 # - 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 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,194 *
