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)
diff --git a/nsis/README.txt b/nsis/README.txt
index 2760609..31fa787 100644
--- a/nsis/README.txt
+++ b/nsis/README.txt
@@ -27,23 +27,20 @@
64-bit: src/GvimExt/gvimext64.dll
32-bit: src/GvimExt/gvimext.dll
-4. Go to the VisVim directory and build VisVim.dll (or get it from a binary
- archive).
-
-5. Get a "diff.exe" program. If you skip this the built-in diff will always
+4. Get a "diff.exe" program. If you skip this the built-in diff will always
be used (which is fine for most users). If you do have your own
"diff.exe" put it in the "../.." directory (above the "vim82" directory,
it's the same for all Vim versions).
You can find one in previous Vim versions or in this archive:
http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
-6 Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
+5 Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
directory). This is required for the terminal window.
-7. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have
+6. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have
to do this on Unix. Make sure the file is in DOS file format!
-8. Get gettext and iconv DLLs from the following site:
+7. Get gettext and iconv DLLs from the following site:
https://github.com/mlocati/gettext-iconv-windows/releases
Both 64- and 32-bit versions are needed.
Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 4d2479a..64c1bc7 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -36,9 +36,6 @@
# Comment the next line if you do not want to add Native Language Support
!define HAVE_NLS
-# Uncomment the next line if you want to include VisVim extension:
-#!define HAVE_VIS_VIM
-
# Comment the following line to create an English-only installer:
!define HAVE_MULTI_LANG
@@ -55,9 +52,6 @@
# ----------- No configurable settings below this line -----------
!include "Library.nsh" # For DLL install
-!ifdef HAVE_VIS_VIM
- !include "UpgradeDLL.nsh" # for VisVim.dll
-!endif
!include "LogicLib.nsh"
!include "MUI2.nsh"
!include "nsDialogs.nsh"
@@ -537,17 +531,6 @@
SectionGroupEnd
##########################################################
-!ifdef HAVE_VIS_VIM
-Section "$(str_section_vis_vim)" id_section_visvim
- SectionIn 3
-
- SetOutPath $0
- !insertmacro UpgradeDLL "${VIMSRC}\VisVim\VisVim.dll" "$0\VisVim.dll" "$0"
- File ${VIMSRC}\VisVim\README_VisVim.txt
-SectionEnd
-!endif
-
-##########################################################
!ifdef HAVE_NLS
Section "$(str_section_nls)" id_section_nls
SectionIn 1 3
@@ -634,12 +617,6 @@
SectionGetSize ${id_section_editwith} $4
IntOp $3 $3 + $4
${EndIf}
-!ifdef HAVE_VIS_VIM
- ${If} ${SectionIsSelected} ${id_section_visvim}
- SectionGetSize ${id_section_visvim} $4
- IntOp $3 $3 + $4
- ${EndIf}
-!endif
!ifdef HAVE_NLS
${If} ${SectionIsSelected} ${id_section_nls}
SectionGetSize ${id_section_nls} $4
@@ -670,9 +647,6 @@
!insertmacro SaveSectionSelection ${id_section_vimrc} "select_vimrc"
!insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome"
!insertmacro SaveSectionSelection ${id_section_pluginvim} "select_pluginvim"
-!ifdef HAVE_VIS_VIM
- !insertmacro SaveSectionSelection ${id_section_visvim} "select_visvim"
-!endif
!ifdef HAVE_NLS
!insertmacro SaveSectionSelection ${id_section_nls} "select_nls"
!endif
@@ -744,9 +718,6 @@
!insertmacro LoadSectionSelection ${id_section_vimrc} "select_vimrc"
!insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome"
!insertmacro LoadSectionSelection ${id_section_pluginvim} "select_pluginvim"
-!ifdef HAVE_VIS_VIM
- !insertmacro LoadSectionSelection ${id_section_visvim} "select_visvim"
-!endif
!ifdef HAVE_NLS
!insertmacro LoadSectionSelection ${id_section_nls} "select_nls"
!endif
@@ -921,9 +892,6 @@
!insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin} $(str_desc_plugin)
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome} $(str_desc_plugin_home)
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim} $(str_desc_plugin_vim)
-!ifdef HAVE_VIS_VIM
- !insertmacro MUI_DESCRIPTION_TEXT ${id_section_visvim} $(str_desc_vis_vim)
-!endif
!ifdef HAVE_NLS
!insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls} $(str_desc_nls)
!endif
@@ -947,13 +915,6 @@
# created. Thus the "vim61" directory is included in it.
StrCpy $0 "$INSTDIR"
-!ifdef HAVE_VIS_VIM
- # If VisVim was installed, unregister the DLL.
- ${If} ${FileExists} "$0\VisVim.dll"
- ExecWait "regsvr32.exe /u /s $0\VisVim.dll"
- ${EndIf}
-!endif
-
# delete the context menu entry and batch files
DetailPrint "$(str_msg_unregistering)"
nsExec::Exec "$0\uninstall.exe -nsis"
@@ -1046,9 +1007,6 @@
RMDir /r $0\syntax
RMDir /r $0\tools
RMDir /r $0\tutor
-!ifdef HAVE_VIS_VIM
- RMDir /r $0\VisVim
-!endif
RMDir /r $0\lang
RMDir /r $0\keymap
Delete $0\*.exe
diff --git a/nsis/lang/danish.nsi b/nsis/lang/danish.nsi
index 3f792bc..b365413 100644
--- a/nsis/lang/danish.nsi
+++ b/nsis/lang/danish.nsi
@@ -79,9 +79,6 @@
LangString str_section_plugin_vim ${LANG_DANISH} "Delte"
LangString str_desc_plugin_vim ${LANG_DANISH} "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."
-LangString str_section_vis_vim ${LANG_DANISH} "VisVim-udvidelser"
-LangString str_desc_vis_vim ${LANG_DANISH} "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
LangString str_section_nls ${LANG_DANISH} "Understøttelse af modersmål"
LangString str_desc_nls ${LANG_DANISH} "Installer filer til understøttelse af modersmål."
diff --git a/nsis/lang/dutch.nsi b/nsis/lang/dutch.nsi
index cf861d4..1d13224 100644
--- a/nsis/lang/dutch.nsi
+++ b/nsis/lang/dutch.nsi
@@ -123,11 +123,6 @@
"Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
voor iedereen op het systeem."
-LangString str_section_vis_vim ${LANG_DUTCH} \
- "VisVim extensie"
-LangString str_desc_vis_vim ${LANG_DUTCH} \
- "VisVim extensie voor Microsoft Visual Studio integratie."
-
LangString str_section_nls ${LANG_DUTCH} \
"Ondersteuning voor andere talen"
LangString str_desc_nls ${LANG_DUTCH} \
diff --git a/nsis/lang/english.nsi b/nsis/lang/english.nsi
index 218c70a..e1be985 100644
--- a/nsis/lang/english.nsi
+++ b/nsis/lang/english.nsi
@@ -121,11 +121,6 @@
"Create plugin directories in Vim install directory, it is used for \
everybody on the system."
-LangString str_section_vis_vim ${LANG_ENGLISH} \
- "VisVim Extension"
-LangString str_desc_vis_vim ${LANG_ENGLISH} \
- "VisVim Extension for Microsoft Visual Studio integration."
-
LangString str_section_nls ${LANG_ENGLISH} \
"Native Language Support"
LangString str_desc_nls ${LANG_ENGLISH} \
diff --git a/nsis/lang/german.nsi b/nsis/lang/german.nsi
index 8c1e4ac..b976ef4 100644
--- a/nsis/lang/german.nsi
+++ b/nsis/lang/german.nsi
@@ -122,11 +122,6 @@
"Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
für alle Benutzer dieses Systems genutzt."
-LangString str_section_vis_vim ${LANG_GERMAN} \
- "VisVim-Erweiterung"
-LangString str_desc_vis_vim ${LANG_GERMAN} \
- "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
LangString str_section_nls ${LANG_GERMAN} \
"Unterstützung für andere Sprachen"
LangString str_desc_nls ${LANG_GERMAN} \
diff --git a/nsis/lang/italian.nsi b/nsis/lang/italian.nsi
index b90e098..bffe285 100644
--- a/nsis/lang/italian.nsi
+++ b/nsis/lang/italian.nsi
@@ -123,11 +123,6 @@
"Crea directory per plugin nella directory di installazione di Vim \
per uso da parte di tutti gli utenti di questo sistema."
-LangString str_section_vis_vim ${LANG_ITALIAN} \
- "Estensione VisVim"
-LangString str_desc_vis_vim ${LANG_ITALIAN} \
- "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
LangString str_section_nls ${LANG_ITALIAN} \
"Supporto Multilingue (NLS)"
LangString str_desc_nls ${LANG_ITALIAN} \
diff --git a/nsis/lang/japanese.nsi b/nsis/lang/japanese.nsi
index e5e1a9a..58f4dcc 100644
--- a/nsis/lang/japanese.nsi
+++ b/nsis/lang/japanese.nsi
@@ -128,11 +128,6 @@
LangString str_desc_plugin_vim ${LANG_JAPANESE} \
"プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"
-LangString str_section_vis_vim ${LANG_JAPANESE} \
- "VisVim 拡張"
-LangString str_desc_vis_vim ${LANG_JAPANESE} \
- "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
LangString str_section_nls ${LANG_JAPANESE} \
"多言語サポート"
LangString str_desc_nls ${LANG_JAPANESE} \
diff --git a/nsis/lang/russian.nsi b/nsis/lang/russian.nsi
index 23458ce..e451208 100644
--- a/nsis/lang/russian.nsi
+++ b/nsis/lang/russian.nsi
@@ -125,11 +125,6 @@
Модули в этом каталоге будут доступны для любого пользователя \
зарегистрировавшегося в системе"
-LangString str_section_vis_vim ${LANG_RUSSIAN} \
- "Подключаемый модуль VisVim"
-LangString str_desc_vis_vim ${LANG_RUSSIAN} \
- "Подключаемый модуль VisVim используется для интеграции с Microsoft Visual Studio"
-
LangString str_section_nls ${LANG_RUSSIAN} \
"Поддержка региональных языков"
LangString str_desc_nls ${LANG_RUSSIAN} \
diff --git a/nsis/lang/serbian.nsi b/nsis/lang/serbian.nsi
index 60170da..9912ec5 100644
--- a/nsis/lang/serbian.nsi
+++ b/nsis/lang/serbian.nsi
@@ -121,11 +121,6 @@
"Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
на систему."
-LangString str_section_vis_vim ${LANG_SERBIAN} \
- "VisVim проширење"
-LangString str_desc_vis_vim ${LANG_SERBIAN} \
- "VisVim проширење за Microsoft Visual Studio интеграцију."
-
LangString str_section_nls ${LANG_SERBIAN} \
"Подршка за домаћи језик"
LangString str_desc_nls ${LANG_SERBIAN} \
diff --git a/nsis/lang/simpchinese.nsi b/nsis/lang/simpchinese.nsi
index a6875a7..2c80054 100644
--- a/nsis/lang/simpchinese.nsi
+++ b/nsis/lang/simpchinese.nsi
@@ -120,11 +120,6 @@
"在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
该目录下的扩展插件。"
-LangString str_section_vis_vim ${LANG_SIMPCHINESE} \
- "VisVim 插件"
-LangString str_desc_vis_vim ${LANG_SIMPCHINESE} \
- "安装与 Visual Studio 集成的 VisVim 插件。"
-
LangString str_section_nls ${LANG_SIMPCHINESE} \
"安装多语言支持"
LangString str_desc_nls ${LANG_SIMPCHINESE} \
diff --git a/nsis/lang/tradchinese.nsi b/nsis/lang/tradchinese.nsi
index c273230..16b6747 100644
--- a/nsis/lang/tradchinese.nsi
+++ b/nsis/lang/tradchinese.nsi
@@ -121,11 +121,6 @@
"在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
在該資料夾里的擴展插件。"
-LangString str_section_vis_vim ${LANG_TRADCHINESE} \
- "安裝 VisVim 插件"
-LangString str_desc_vis_vim ${LANG_TRADCHINESE} \
- "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
LangString str_section_nls ${LANG_TRADCHINESE} \
"安裝本地語言支持"
LangString str_desc_nls ${LANG_TRADCHINESE} \
diff --git a/nsis/lang/turkish.nsi b/nsis/lang/turkish.nsi
index 4c966c5..1046b81 100644
--- a/nsis/lang/turkish.nsi
+++ b/nsis/lang/turkish.nsi
@@ -90,11 +90,6 @@
"Eklenti dizinlerini Vim yükleme dizininde oluşturur. Bu eklentilerden \
bilgisayarın tüm kullanıcıları yararlanabilir."
-LangString str_section_vis_vim ${LANG_TURKISH} \
- "VisVim eklentisi"
-LangString str_desc_vis_vim ${LANG_TURKISH} \
- "Microsoft Visual Studio entegrasyonu için VisVim eklentisi"
-
LangString str_section_nls ${LANG_TURKISH} \
"Ek dil desteği"
LangString str_desc_nls ${LANG_TURKISH} \