use Visual Stdio 2022, catch up Vim 9

VERSION

@@ -1,6 +1,6 @@
-VIM_VER = 8.2.1287
-PATCHSET_VER = 20200724
+VIM_VER = 9.0.0654
+PATCHSET_VER = 20221002
 
-VIM_VER_SHORT = 82
+VIM_VER_SHORT = 90
 
 # vim:set ts=8 sts=8 sw=8 tw=0 noet ft=make:

build/msvc/Makefile

@@ -58,39 +58,44 @@ VIMDLL=$(VIMDLL_BASE).dll
 MSVC_VERSION=msvc9
 MSVCRT_SUBDIR=Microsoft.VC90.CRT
 MSVCRT_FILES=msvcr90.dll
+MSVCRT_COPY=1
 !ELSEIF "$(_NMAKE_VER)" >= "10." && "$(_NMAKE_VER)" < "11."
 MSVC_VERSION=msvc10
 MSVCRT_SUBDIR=Microsoft.VC100.CRT
 MSVCRT_FILES=msvcr100.dll
+MSVCRT_COPY=1
 !ELSEIF "$(_NMAKE_VER)" >= "11." && "$(_NMAKE_VER)" < "12."
 MSVC_VERSION=msvc11
 MSVCRT_SUBDIR=Microsoft.VC110.CRT
 MSVCRT_FILES=msvcr110.dll
+MSVCRT_COPY=1
 !ELSEIF "$(_NMAKE_VER)" >= "12." && "$(_NMAKE_VER)" < "13."
 MSVC_VERSION=msvc12
 MSVCRT_SUBDIR=Microsoft.VC120.CRT
 MSVCRT_FILES=msvcr120.dll
+MSVCRT_COPY=1
 !ELSEIF "$(_NMAKE_VER)" >= "14." && "$(_NMAKE_VER)" < "15."
 MSVC_VERSION=msvc14
 MSVCRT_SUBDIR=Microsoft.VC140.CRT
 MSVCRT_FILES=vcruntime140.dll
+MSVCRT_COPY=0
 !ELSE
 !ERROR Unknown MSVC version: $(_NMAKE_VER)
 !ENDIF
 
 archive:
- $(MAKE) archive-pre
- $(MAKE) archive-dist
+ $(MAKE) /$(MAKEFLAGS) archive-pre
+ $(MAKE) /$(MAKEFLAGS) archive-dist
 
 archive-pre:
- $(MAKE) "$(INSTALL_DIR)\bin\iconv.dll"
- $(MAKE) "$(INSTALL_DIR)\bin\intl.dll"
- $(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
- $(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
- $(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe"
- $(MAKE) vim-clean vim-install
- $(MAKE) vim-mo-install vim-patch-install
- $(MAKE) langja-install
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\iconv.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\intl.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\lua51.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\winpty-agent.exe"
+ $(MAKE) /$(MAKEFLAGS) vim-clean vim-install
+ $(MAKE) /$(MAKEFLAGS) vim-mo-install vim-patch-install
+ $(MAKE) /$(MAKEFLAGS) langja-install
 
 contrib: $(INSTALL_DIR)\bin\iconv.dll $(INSTALL_DIR)\bin\intl.dll \
  $(INSTALL_DIR)\lib\libXpm.lib \
@@ -308,23 +313,23 @@ vim-build:
 
 vim-test: vim-build
  cd "$(VIM_DIR)\src\testdir"
- nmake /NOLOGO /F Make_dos.mak clean
- -nmake /NOLOGO /F Make_dos.mak VIMPROG=..\vim
+ nmake /NOLOGO /F Make_mvc.mak clean
+ -nmake /NOLOGO /F Make_mvc.mak VIMPROG=..\vim
  cd "$(BUILD_DIR)"
  IF NOT EXIST "$(TESTRES_DIR)" MD "$(TESTRES_DIR)"
  -COPY "$(VIM_DIR)\src\testdir\test_result.log" "$(TESTRES_DIR)\$(DATE_VER)_$(TIME_VER)-cui.log"
 
 vim-test-gui: vim-build
  cd "$(VIM_DIR)\src\testdir"
- nmake /NOLOGO /F Make_dos.mak clean
- -nmake /NOLOGO /F Make_dos.mak VIMPROG=..\gvim
+ nmake /NOLOGO /F Make_mvc.mak clean
+ -nmake /NOLOGO /F Make_mvc.mak VIMPROG=..\gvim
  cd "$(BUILD_DIR)"
  IF NOT EXIST "$(TESTRES_DIR)" MD "$(TESTRES_DIR)"
  -COPY "$(VIM_DIR)\src\testdir\test_result.log" "$(TESTRES_DIR)\$(DATE_VER)_$(TIME_VER)-gui.log"
 
 vim-test-clean:
  cd "$(VIM_DIR)\src\testdir"
- nmake /NOLOGO /F Make_dos.mak clean
+ nmake /NOLOGO /F Make_mvc.mak clean
  cd "$(BUILD_DIR)"
 
 vim-clean:
@@ -379,10 +384,10 @@ pdb-distdir: $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb
 pdb-archive: $(OUTPUT_DIR)\$(PDB_DIST_ZIP)
 
 $(VIM_DIR)\src\vim.pdb $(VIM_DIR)\src\gvim.pdb:
- $(MAKE) vim-build
+ $(MAKE) /$(MAKEFLAGS) vim-build
 
 $(VIM_DIR)\src\$(VIMDLL_BASE).pdb:
- $(MAKE) vim-build
+ $(MAKE) /$(MAKEFLAGS) vim-build
 
 $(PDB_DIST_DIR):
  IF NOT EXIST "$(PDB_DIST_DIR)" MKDIR "$(PDB_DIST_DIR)"
@@ -394,18 +399,18 @@ $(INSTALL_DIR)\bin\gvim.pdb: $(VIM_DIR)\src\gvim.pdb
  -$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" gvim.pdb
 
 $(PDB_DIST_DIR)\vim.pdb: $(INSTALL_DIR)\bin\vim.pdb
- $(MAKE) $(PDB_DIST_DIR)
+ $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR)
  -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" vim.pdb
 
 $(PDB_DIST_DIR)\gvim.pdb: $(INSTALL_DIR)\bin\gvim.pdb
- $(MAKE) $(PDB_DIST_DIR)
+ $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR)
  -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" gvim.pdb
 
 $(INSTALL_DIR)\bin\$(VIMDLL_BASE).pdb: $(VIM_DIR)\src\$(VIMDLL_BASE).pdb
  -$(COPY) "$(VIM_DIR)\src" "$(INSTALL_DIR)\bin" $(VIMDLL_BASE).pdb
 
 $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb: $(INSTALL_DIR)\bin\$(VIMDLL_BASE).pdb
- $(MAKE) $(PDB_DIST_DIR)
+ $(MAKE) /$(MAKEFLAGS) $(PDB_DIST_DIR)
  -$(COPY) "$(INSTALL_DIR)\bin" "$(PDB_DIST_DIR)" $(VIMDLL_BASE).pdb
 
 $(OUTPUT_DIR)\$(PDB_DIST_ZIP): $(PDB_DIST_DIR)\$(VIMDLL_BASE).pdb
@@ -465,14 +470,14 @@ build-dist:
  -"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \
  -c "helptags $(VIM_DIST_DIR)\$(RTDIR_NAME)\doc" -c quit
 # Copy MSVC runtime files.
- -$(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES)
+ -IF $(MSVCRT_COPY) NEQ 0 $(COPY) "$(MSVCRT_DIR)" "$(VIM_DIST_DIR)" $(MSVCRT_FILES)
 # Copy patch (diff) files.
  -$(COPY) /E "$(VIM_PATCH_DIR)" "$(VIM_DIST_DIR)\patch"
 # Copy lua related files
  -$(COPY) /E "$(INSTALL_DIR)\bin\lua" "$(VIM_DIST_DIR)\lua"
 
 archive-dist: build-dist
- $(MAKE) zip-dist
+ $(MAKE) /$(MAKEFLAGS) zip-dist
 
 zip-dist:
  cd "$(OUTPUT_DIR)"
@@ -482,32 +487,38 @@ zip-dist:
 clean-dist:
  -RD /S /Q "$(VIM_DIST_DIR)"
 
-build-release-pre:
- $(MAKE) "$(INSTALL_DIR)\bin\iconv.dll"
- $(MAKE) "$(INSTALL_DIR)\bin\intl.dll"
- $(MAKE) "$(INSTALL_DIR)\lib\libXpm.lib"
- $(MAKE) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
- $(MAKE) "$(INSTALL_DIR)\bin\lua51.dll"
- $(MAKE) "$(INSTALL_DIR)\bin\winpty-agent.exe"
- $(MAKE) vim-clean
- $(MAKE) vim-install vim-mo-install vim-patch-install
- $(MAKE) langja-install
- $(MAKE) build-dist
- $(MAKE) pdb-distdir
-
-build-release-core:
- $(MAKE) zip-dist
- $(MAKE) pdb-archive
-
-build-release-post:
- $(MAKE) vim-clean
+build-release-pre: build-release
+
+build-release-core: build-release-archive
+
+build-release-post: build-release-clean
+
+build-release:
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\iconv.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\intl.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\lib\libXpm.lib"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\lua51.dll"
+ $(MAKE) /$(MAKEFLAGS) "$(INSTALL_DIR)\bin\winpty-agent.exe"
+ $(MAKE) /$(MAKEFLAGS) vim-clean
+ $(MAKE) /$(MAKEFLAGS) vim-install vim-mo-install vim-patch-install
+ $(MAKE) /$(MAKEFLAGS) langja-install
+ $(MAKE) /$(MAKEFLAGS) build-dist
+ $(MAKE) /$(MAKEFLAGS) pdb-distdir
+
+build-release-archive:
+ $(MAKE) /$(MAKEFLAGS) zip-dist
+ $(MAKE) /$(MAKEFLAGS) pdb-archive
+
+build-release-clean:
+ $(MAKE) /$(MAKEFLAGS) vim-clean
 
 snapshot: snapshot-build snapshot-install snapshot-archive
 
 snapshot-pre: snapshot-install snapshot-archive
 
 snapshot-build:
- $(MAKE) vim-clean vim-build
+ $(MAKE) /$(MAKEFLAGS) vim-clean vim-build
 
 snapshot-install:
  IF NOT EXIST "$(SNAPSHOT_DIR)" MD "$(SNAPSHOT_DIR)"
@@ -535,22 +546,22 @@ snapshot-archive:
  snapshot
 
 "$(INSTALL_DIR)\bin\iconv.dll":
- $(MAKE) iconv-clean iconv-install iconv-distclean
+ $(MAKE) /$(MAKEFLAGS) iconv-clean iconv-install iconv-distclean
 
 "$(INSTALL_DIR)\bin\intl.dll":
- $(MAKE) gettext-clean gettext-install gettext-distclean
+ $(MAKE) /$(MAKEFLAGS) gettext-clean gettext-install gettext-distclean
 
 "$(INSTALL_DIR)\lib\libXpm.lib":
- $(MAKE) xpm-clean xpm-install xpm-distclean
+ $(MAKE) /$(MAKEFLAGS) xpm-clean xpm-install xpm-distclean
 
 "$(INSTALL_DIR)\bin\$(VIMPROC_DLL)":
- $(MAKE) vimproc-clean vimproc-install vimproc-distclean
+ $(MAKE) /$(MAKEFLAGS) vimproc-clean vimproc-install vimproc-distclean
 
 "$(INSTALL_DIR)\bin\lua51.dll":
- $(MAKE) luajit-install
+ $(MAKE) /$(MAKEFLAGS) luajit-install
 
 "$(INSTALL_DIR)\bin\winpty-agent.exe":
- $(MAKE) winpty-install
+ $(MAKE) /$(MAKEFLAGS) winpty-install
 
 "$(INSTALL_DIR)\bin\vim.exe":
- $(MAKE) vim-clean vim-install vim-mo-install vim-clean
+ $(MAKE) /$(MAKEFLAGS) vim-clean vim-install vim-mo-install vim-clean

build/msvc/vim.mak

@@ -15,6 +15,11 @@ DIRECTX=yes
 # Terminal support.
 TERMINAL=yes
 
+# Disable language interfaces
+DISABLE_PERL=yes
+DISABLE_PYTHON=yes
+DISABLE_RUBY=yes
+
 # Perl settings
 !if !defined(DISABLE_IF) && !defined(DISABLE_PERL)
 DYNAMIC_PERL=yes

kaoriya/doc/CHANGES.md

@@ -1,3 +1,18 @@
+## 2022/10/XX の変更点
+
+* ベースコードを9.0.XXXXに更新しました
+* コンパイラを Visual Studio 2022 (Visual C 17.X) に変更しました
+* 外部言語インターフェースの変更
+
+ LuaJITを除く外部言語インターフェース(Perl, Python, Ruby)を廃止しました
+ それらが必要な型は vim-win32-installer をご利用ください
+
+ <https:/vim/vim-win32-installer/releases/latest>
+
+* `:Scratch` バッファを `:w foo.txt` で保存した際の挙動を修正しました
+
+ <https:/koron/vim-kaoriya/issues/30>
+
 ## 2020/07/24 の変更点
 
 * ベースコードを8.2.1287に更新しました

kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim

@@ -3,7 +3,7 @@
 " cmdex.vim - Extra commands
 "
 " Maintainer: Muraoka Taro <[email protected]>
-" Last Change: 19-Mar-2013.
+" Last Change: 04-Oct-2022.
 " Commands:
 " :MenuLang {language}
 " (language: none/ja/zh...etc.)
@@ -85,9 +85,10 @@ command! -nargs=0 IminsertOn iunmap <buffer> <ESC>
 " Open a scratch (no file) buffer.
 command! -nargs=0 Scratch new | setlocal bt=nofile noswf | let b:cmdex_scratch = 1
 function! s:CheckScratchWritten()
- if &buftype ==# 'nofile' && expand('%').'x' !=# 'x' && exists('b:cmdex_scratch') && b:cmdex_scratch == 1
- setlocal buftype= swapfile
+ if &buftype ==# 'nofile' && get(b:, 'cmdex_scratch', 0) == 1 && expand('<afile>') !=# ''
  unlet b:cmdex_scratch
+ setlocal buftype= swapfile
+ execute "edit!" expand('<afile>')
  endif
 endfunction
 augroup CmdexScratch