Skip to content

Commit 251c1e2

Browse files
arp242brammool
authored andcommitted
patch 9.0.0698: VisVim is outdated, does not work with current Visual Studio
Problem: VisVim is outdated, does not work with current Visual Studio. Solution: Remove VisVim. (Martin Tournoij)
1 parent 16dab41 commit 251c1e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+13
-3298
lines changed

Filelist

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -590,30 +590,9 @@ SRC_DOS = \
590590
nsis/README.txt \
591591
nsis/lang/*.nsi \
592592
uninstall.txt \
593-
src/VisVim/Commands.cpp \
594-
src/VisVim/Commands.h \
595-
src/VisVim/DSAddIn.cpp \
596-
src/VisVim/DSAddIn.h \
597-
src/VisVim/OleAut.cpp \
598-
src/VisVim/OleAut.h \
599-
src/VisVim/README_VisVim.txt \
600-
src/VisVim/Reg.cpp \
601-
src/VisVim/Register.bat \
602-
src/VisVim/Resource.h \
603-
src/VisVim/StdAfx.cpp \
604-
src/VisVim/StdAfx.h \
605-
src/VisVim/UnRegist.bat \
606-
src/VisVim/VisVim.cpp \
607-
src/VisVim/VisVim.def \
608-
src/VisVim/VisVim.mak \
609-
src/VisVim/VisVim.h \
610-
src/VisVim/VisVim.odl \
611-
src/VisVim/VisVim.rc \
612-
src/VisVim/VsReadMe.txt \
613593

614594
# source files for DOS without CR/LF translation (also in the extra archive)
615595
SRC_DOS_BIN = \
616-
src/VisVim/Res/*.bmp \
617596
src/tearoff.bmp \
618597
src/tools.bmp \
619598
src/vim*.ico \
@@ -945,7 +924,6 @@ EXTRA = \
945924
$(RT_EXTRA) \
946925
$(SRC_EXTRA) \
947926
README_extra.txt \
948-
src/VisVim/VisVim.dll \
949927
runtime/vimlogo.xpm \
950928

951929
# files in READMEdir that are included from the top dir

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ MINOR = 0
198198
# - copy these files (get them from a binary archive or build them):
199199
# gvimext.dll in src/GvimExt
200200
# gvimext64.dll in src/GvimExt
201-
# VisVim.dll in src/VisVim
202-
# Note: VisVim needs to be build with MSVC 5, newer versions don't work.
203201
# gvimext64.dll can be obtained from:
204202
# https://github.com/vim/vim-win32-installer/releases
205203
# It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
@@ -554,8 +552,6 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
554552
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
555553
cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
556554
cp README_ole.txt dist/vim/$(VIMRTDIR)
557-
cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
558-
cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR)
559555
cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE)
560556
cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb
561557

READMEdir/README_extra.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ src/Make_mvc.mak MS Visual C++ makefile for the Win32 GUI.
2929

3030
src/if_ole.* OLE automation interface, for MS Windows 95 and NT.
3131

32-
src/VisVim/* Integration of Win32 GUI with MS Visual Developer
33-
Studio.
34-
3532
src/GvimExt/* DLL for the "Edit with Vim" context menu entry
3633

3734
nsis/* NSIS script to build the self-installing MS-Windows exe

READMEdir/README_ole.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
README_ole.txt for version 9.0 of Vim: Vi IMproved.
22

3-
This archive contains gvim.exe with OLE interface and VisVim.
3+
This archive contains gvim.exe with OLE interface.
44
This version of gvim.exe can also load a number of interface dynamically (you
55
can optionally install the .dll files for each interface).
66
It is only for MS-Windows 95/98/ME/NT/2000/XP.
@@ -15,6 +15,3 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
1515

1616
For further information, type this inside Vim:
1717
:help if_ole
18-
19-
Furthermore, this archive contains VISVIM.DLL. It can be used to integrate
20-
the OLE gvim with Microsoft Visual Developer Studio. See VisVim/README.txt.

READMEdir/README_srcdos.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ These files are in the runtime archive (vim90rt.zip).
66

77

88
The DOS source archive contains the files needed to compile Vim on MS-Windows.
9-
It is packed for MS-Windows systems, with CR-LF. It also includes the VisVim
10-
sources.
9+
It is packed for MS-Windows systems, with CR-LF.
1110

1211
See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.

nsis/README.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,20 @@ To build the installable .exe:
2727
64-bit: src/GvimExt/gvimext64.dll
2828
32-bit: src/GvimExt/gvimext.dll
2929

30-
4. Go to the VisVim directory and build VisVim.dll (or get it from a binary
31-
archive).
32-
33-
5. Get a "diff.exe" program. If you skip this the built-in diff will always
30+
4. Get a "diff.exe" program. If you skip this the built-in diff will always
3431
be used (which is fine for most users). If you do have your own
3532
"diff.exe" put it in the "../.." directory (above the "vim82" directory,
3633
it's the same for all Vim versions).
3734
You can find one in previous Vim versions or in this archive:
3835
http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
3936

40-
6 Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
37+
5 Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
4138
directory). This is required for the terminal window.
4239

43-
7. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have
40+
6. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have
4441
to do this on Unix. Make sure the file is in DOS file format!
4542

46-
8. Get gettext and iconv DLLs from the following site:
43+
7. Get gettext and iconv DLLs from the following site:
4744
https://github.com/mlocati/gettext-iconv-windows/releases
4845
Both 64- and 32-bit versions are needed.
4946
Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract

nsis/gvim.nsi

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ Unicode true
3636
# Comment the next line if you do not want to add Native Language Support
3737
!define HAVE_NLS
3838

39-
# Uncomment the next line if you want to include VisVim extension:
40-
#!define HAVE_VIS_VIM
41-
4239
# Comment the following line to create an English-only installer:
4340
!define HAVE_MULTI_LANG
4441

@@ -55,9 +52,6 @@ Unicode true
5552
# ----------- No configurable settings below this line -----------
5653

5754
!include "Library.nsh" # For DLL install
58-
!ifdef HAVE_VIS_VIM
59-
!include "UpgradeDLL.nsh" # for VisVim.dll
60-
!endif
6155
!include "LogicLib.nsh"
6256
!include "MUI2.nsh"
6357
!include "nsDialogs.nsh"
@@ -536,17 +530,6 @@ SectionGroup $(str_group_plugin) id_group_plugin
536530
SectionEnd
537531
SectionGroupEnd
538532

539-
##########################################################
540-
!ifdef HAVE_VIS_VIM
541-
Section "$(str_section_vis_vim)" id_section_visvim
542-
SectionIn 3
543-
544-
SetOutPath $0
545-
!insertmacro UpgradeDLL "${VIMSRC}\VisVim\VisVim.dll" "$0\VisVim.dll" "$0"
546-
File ${VIMSRC}\VisVim\README_VisVim.txt
547-
SectionEnd
548-
!endif
549-
550533
##########################################################
551534
!ifdef HAVE_NLS
552535
Section "$(str_section_nls)" id_section_nls
@@ -634,12 +617,6 @@ Section -post
634617
SectionGetSize ${id_section_editwith} $4
635618
IntOp $3 $3 + $4
636619
${EndIf}
637-
!ifdef HAVE_VIS_VIM
638-
${If} ${SectionIsSelected} ${id_section_visvim}
639-
SectionGetSize ${id_section_visvim} $4
640-
IntOp $3 $3 + $4
641-
${EndIf}
642-
!endif
643620
!ifdef HAVE_NLS
644621
${If} ${SectionIsSelected} ${id_section_nls}
645622
SectionGetSize ${id_section_nls} $4
@@ -670,9 +647,6 @@ Section -post
670647
!insertmacro SaveSectionSelection ${id_section_vimrc} "select_vimrc"
671648
!insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome"
672649
!insertmacro SaveSectionSelection ${id_section_pluginvim} "select_pluginvim"
673-
!ifdef HAVE_VIS_VIM
674-
!insertmacro SaveSectionSelection ${id_section_visvim} "select_visvim"
675-
!endif
676650
!ifdef HAVE_NLS
677651
!insertmacro SaveSectionSelection ${id_section_nls} "select_nls"
678652
!endif
@@ -744,9 +718,6 @@ Function .onInit
744718
!insertmacro LoadSectionSelection ${id_section_vimrc} "select_vimrc"
745719
!insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome"
746720
!insertmacro LoadSectionSelection ${id_section_pluginvim} "select_pluginvim"
747-
!ifdef HAVE_VIS_VIM
748-
!insertmacro LoadSectionSelection ${id_section_visvim} "select_visvim"
749-
!endif
750721
!ifdef HAVE_NLS
751722
!insertmacro LoadSectionSelection ${id_section_nls} "select_nls"
752723
!endif
@@ -921,9 +892,6 @@ FunctionEnd
921892
!insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin} $(str_desc_plugin)
922893
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome} $(str_desc_plugin_home)
923894
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim} $(str_desc_plugin_vim)
924-
!ifdef HAVE_VIS_VIM
925-
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_visvim} $(str_desc_vis_vim)
926-
!endif
927895
!ifdef HAVE_NLS
928896
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls} $(str_desc_nls)
929897
!endif
@@ -947,13 +915,6 @@ Section "un.$(str_unsection_register)" id_unsection_register
947915
# created. Thus the "vim61" directory is included in it.
948916
StrCpy $0 "$INSTDIR"
949917

950-
!ifdef HAVE_VIS_VIM
951-
# If VisVim was installed, unregister the DLL.
952-
${If} ${FileExists} "$0\VisVim.dll"
953-
ExecWait "regsvr32.exe /u /s $0\VisVim.dll"
954-
${EndIf}
955-
!endif
956-
957918
# delete the context menu entry and batch files
958919
DetailPrint "$(str_msg_unregistering)"
959920
nsExec::Exec "$0\uninstall.exe -nsis"
@@ -1046,9 +1007,6 @@ Section "un.$(str_unsection_exe)" id_unsection_exe
10461007
RMDir /r $0\syntax
10471008
RMDir /r $0\tools
10481009
RMDir /r $0\tutor
1049-
!ifdef HAVE_VIS_VIM
1050-
RMDir /r $0\VisVim
1051-
!endif
10521010
RMDir /r $0\lang
10531011
RMDir /r $0\keymap
10541012
Delete $0\*.exe

nsis/lang/danish.nsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ LangString str_desc_plugin_home ${LANG_DANISH} "Opret plugin-mapper i HO
7979
LangString str_section_plugin_vim ${LANG_DANISH} "Delte"
8080
LangString str_desc_plugin_vim ${LANG_DANISH} "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."
8181

82-
LangString str_section_vis_vim ${LANG_DANISH} "VisVim-udvidelser"
83-
LangString str_desc_vis_vim ${LANG_DANISH} "VisVim-udvidelser til integrering i Microsoft Visual Studio."
84-
8582
LangString str_section_nls ${LANG_DANISH} "Understøttelse af modersmål"
8683
LangString str_desc_nls ${LANG_DANISH} "Installer filer til understøttelse af modersmål."
8784

nsis/lang/dutch.nsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim ${LANG_DUTCH} \
123123
"Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
124124
voor iedereen op het systeem."
125125

126-
LangString str_section_vis_vim ${LANG_DUTCH} \
127-
"VisVim extensie"
128-
LangString str_desc_vis_vim ${LANG_DUTCH} \
129-
"VisVim extensie voor Microsoft Visual Studio integratie."
130-
131126
LangString str_section_nls ${LANG_DUTCH} \
132127
"Ondersteuning voor andere talen"
133128
LangString str_desc_nls ${LANG_DUTCH} \

nsis/lang/english.nsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim ${LANG_ENGLISH} \
121121
"Create plugin directories in Vim install directory, it is used for \
122122
everybody on the system."
123123

124-
LangString str_section_vis_vim ${LANG_ENGLISH} \
125-
"VisVim Extension"
126-
LangString str_desc_vis_vim ${LANG_ENGLISH} \
127-
"VisVim Extension for Microsoft Visual Studio integration."
128-
129124
LangString str_section_nls ${LANG_ENGLISH} \
130125
"Native Language Support"
131126
LangString str_desc_nls ${LANG_ENGLISH} \

0 commit comments

Comments
 (0)