From 907b6f0d0294d030cdc3ebe8282e18dc184f5070 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 19 Jul 2020 00:08:46 +0900 Subject: [PATCH 01/10] catch up 8.2.1237 --- VERSION | 4 ++-- patches | 2 +- vim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 8cd17d9..fdce0b1 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.2.1233 -PATCHSET_VER = 20200718 +VIM_VER = 8.2.1237 +PATCHSET_VER = 20200719 VIM_VER_SHORT = 82 diff --git a/patches b/patches index 58ab972..bfdd5cb 160000 --- a/patches +++ b/patches @@ -1 +1 @@ -Subproject commit 58ab9724bf214ceefbda95b7f2f2cba92dbabcba +Subproject commit bfdd5cb01600bac9cd92b6f2d114993c71b1136e diff --git a/vim b/vim index f0b9f43..447bfba 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit f0b9f43c3169037b7f2cd70e4939ba1ef26ada1c +Subproject commit 447bfba24b231777a79bf53cdb33f44d9691e47e From 59b1df852a8463d8a0c2db89329f55afc009f363 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Sun, 19 Jul 2020 10:41:25 +0900 Subject: [PATCH 02/10] catch up 8.2.1241 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index fdce0b1..0392b96 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.2.1237 +VIM_VER = 8.2.1241 PATCHSET_VER = 20200719 VIM_VER_SHORT = 82 diff --git a/vim b/vim index 447bfba..6434fc5 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 447bfba24b231777a79bf53cdb33f44d9691e47e +Subproject commit 6434fc574dfbde11461e70e5a62712370edf38e6 From 2f6011b1e82e738eddab0a8e334d8e02c3c9d3e8 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 20 Jul 2020 01:03:49 +0900 Subject: [PATCH 03/10] catch up 8.2.1247 --- VERSION | 4 ++-- vim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 0392b96..7d6b2e5 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.2.1241 -PATCHSET_VER = 20200719 +VIM_VER = 8.2.1247 +PATCHSET_VER = 20200720 VIM_VER_SHORT = 82 diff --git a/vim b/vim index 6434fc5..bf9d8c3 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 6434fc574dfbde11461e70e5a62712370edf38e6 +Subproject commit bf9d8c3765a5255c0a0b577ca2e25d70a8bcb688 From 8eb1deec95970ad1a9fac153796005ff0f9ffd25 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 20 Jul 2020 13:26:11 +0900 Subject: [PATCH 04/10] update for xubuntu --- build/xubuntu/01-configure.sh | 1 - build/xubuntu/Makefile | 1 - build/xubuntu/upgrade-kaoriya-vim | 1 - 3 files changed, 3 deletions(-) diff --git a/build/xubuntu/01-configure.sh b/build/xubuntu/01-configure.sh index 7f3b862..9007326 100755 --- a/build/xubuntu/01-configure.sh +++ b/build/xubuntu/01-configure.sh @@ -6,7 +6,6 @@ --enable-gui=gtk2 \ --enable-luainterp=dynamic \ --with-luajit \ - --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-rubyinterp=dynamic \ --enable-fail-if-missing diff --git a/build/xubuntu/Makefile b/build/xubuntu/Makefile index 4a7d6ff..bb32726 100644 --- a/build/xubuntu/Makefile +++ b/build/xubuntu/Makefile @@ -8,7 +8,6 @@ VIM_CONFIG = --with-features=huge \ --enable-gui=gtk2 \ --enable-luainterp=dynamic \ --with-luajit \ - --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-rubyinterp=dynamic \ --enable-fail-if-missing diff --git a/build/xubuntu/upgrade-kaoriya-vim b/build/xubuntu/upgrade-kaoriya-vim index 7088162..0c56468 100755 --- a/build/xubuntu/upgrade-kaoriya-vim +++ b/build/xubuntu/upgrade-kaoriya-vim @@ -11,7 +11,6 @@ guilt push --all --enable-gui=gtk2 \ --enable-luainterp=dynamic \ --with-luajit \ - --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-rubyinterp=dynamic \ --enable-fail-if-missing From 7de1e9f80c6b3f05624b2a724ce5724b7a85e099 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Mon, 20 Jul 2020 22:24:29 +0900 Subject: [PATCH 05/10] catch up 8.2.1253 --- VERSION | 2 +- vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 7d6b2e5..aa49cb1 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.2.1247 +VIM_VER = 8.2.1253 PATCHSET_VER = 20200720 VIM_VER_SHORT = 82 diff --git a/vim b/vim index bf9d8c3..b146e01 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit bf9d8c3765a5255c0a0b577ca2e25d70a8bcb688 +Subproject commit b146e01a7e41bf5787a2b5ccc6c340ed6001f308 From 83a8aa2c1220da52d65795c64ec543bcd6e5d25b Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Tue, 21 Jul 2020 18:00:08 +0900 Subject: [PATCH 06/10] catch up 8.2.1258 --- VERSION | 4 ++-- vim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index aa49cb1..6cb0cb4 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.2.1253 -PATCHSET_VER = 20200720 +VIM_VER = 8.2.1258 +PATCHSET_VER = 20200721 VIM_VER_SHORT = 82 diff --git a/vim b/vim index b146e01..08815a1 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit b146e01a7e41bf5787a2b5ccc6c340ed6001f308 +Subproject commit 08815a1d0350fbcc007aea5dd1272454c03fab4f From 90c09d1edfffc87e436752bf8ad177a898a36798 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 22 Jul 2020 21:29:04 +0900 Subject: [PATCH 07/10] catcn up 8.2.1266 --- VERSION | 2 +- build/msvc/Makefile | 3 +-- kaoriya/doc/CHANGES.md | 5 +++++ vim | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 6cb0cb4..dad5d95 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -VIM_VER = 8.2.1258 +VIM_VER = 8.2.1266 PATCHSET_VER = 20200721 VIM_VER_SHORT = 82 diff --git a/build/msvc/Makefile b/build/msvc/Makefile index 43d79a5..0665283 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -458,8 +458,7 @@ build-dist: -$(COPY) "$(VIM_DIR)" "$(VIM_DIST_DIR)\origdoc" README.txt -$(COPY) "$(INSTALL_DIR)\bin" "$(VIM_DIST_DIR)" \ vim.exe gvim.exe $(VIMDLL) vimrun.exe xxd.exe tee.exe \ - iconv.dll intl.dll luajit.exe lua51.dll \ - winpty.dll winpty-agent.exe + iconv.dll intl.dll luajit.exe lua51.dll -$(COPY) /E "$(VIM_DIR)\runtime" "$(VIM_DIST_DIR)\$(RTDIR_NAME)" -$(COPY) /E "$(VIM_INSTALL_DIR)" "$(VIM_DIST_DIR)\$(RTDIR_NAME)" -"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \ diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index 3f40976..c4c94d4 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,3 +1,8 @@ +## 2020/07/XX の変更点 + +* ベースコードを8.2.1266に更新しました +* winpty の同梱をやめました(`:terminal` 等はConPTYで動作します) + ## 2020/07/18 の変更点 * ベースコードを8.2.1233に更新しました diff --git a/vim b/vim index 08815a1..bc6fcbe 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit 08815a1d0350fbcc007aea5dd1272454c03fab4f +Subproject commit bc6fcbe4ce52bc48c3d77b24086acc61ed3333bc From 5387344c0819ff64fa044c4a913ac2f2a0350633 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Wed, 22 Jul 2020 22:04:44 +0900 Subject: [PATCH 08/10] resurrect winpty --- build/msvc/Makefile | 3 ++- kaoriya/doc/CHANGES.md | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/msvc/Makefile b/build/msvc/Makefile index 0665283..43d79a5 100644 --- a/build/msvc/Makefile +++ b/build/msvc/Makefile @@ -458,7 +458,8 @@ build-dist: -$(COPY) "$(VIM_DIR)" "$(VIM_DIST_DIR)\origdoc" README.txt -$(COPY) "$(INSTALL_DIR)\bin" "$(VIM_DIST_DIR)" \ vim.exe gvim.exe $(VIMDLL) vimrun.exe xxd.exe tee.exe \ - iconv.dll intl.dll luajit.exe lua51.dll + iconv.dll intl.dll luajit.exe lua51.dll \ + winpty.dll winpty-agent.exe -$(COPY) /E "$(VIM_DIR)\runtime" "$(VIM_DIST_DIR)\$(RTDIR_NAME)" -$(COPY) /E "$(VIM_INSTALL_DIR)" "$(VIM_DIST_DIR)\$(RTDIR_NAME)" -"$(INSTALL_DIR)\bin\vim.exe" -nes -u NONE -U NONE --noplugin \ diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index c4c94d4..be361d2 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,7 +1,6 @@ ## 2020/07/XX の変更点 * ベースコードを8.2.1266に更新しました -* winpty の同梱をやめました(`:terminal` 等はConPTYで動作します) ## 2020/07/18 の変更点 From 03972377af0fcfe59b7679dc65b60ddabd00c933 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 23 Jul 2020 10:38:34 +0900 Subject: [PATCH 09/10] catch up 8.2.1273 --- VERSION | 4 ++-- vim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index dad5d95..4dc2eb3 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.2.1266 -PATCHSET_VER = 20200721 +VIM_VER = 8.2.1273 +PATCHSET_VER = 20200723 VIM_VER_SHORT = 82 diff --git a/vim b/vim index bc6fcbe..c69950a 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit bc6fcbe4ce52bc48c3d77b24086acc61ed3333bc +Subproject commit c69950ac17225d07f973b39d5b0eb94291077808 From 91b7b3978db1ea266b3440b0ca4e700252151d58 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Fri, 24 Jul 2020 11:03:05 +0900 Subject: [PATCH 10/10] catch up 8.2.1287 --- VERSION | 4 ++-- kaoriya/doc/CHANGES.md | 8 ++++++-- vim | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 4dc2eb3..1a908bf 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VIM_VER = 8.2.1273 -PATCHSET_VER = 20200723 +VIM_VER = 8.2.1287 +PATCHSET_VER = 20200724 VIM_VER_SHORT = 82 diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md index be361d2..13b1d37 100644 --- a/kaoriya/doc/CHANGES.md +++ b/kaoriya/doc/CHANGES.md @@ -1,6 +1,10 @@ -## 2020/07/XX の変更点 +## 2020/07/24 の変更点 -* ベースコードを8.2.1266に更新しました +* ベースコードを8.2.1287に更新しました +* 既知の問題: 特に無し +* テストは全て通過しました + + 詳細: ## 2020/07/18 の変更点 diff --git a/vim b/vim index c69950a..40f4f7a 160000 --- a/vim +++ b/vim @@ -1 +1 @@ -Subproject commit c69950ac17225d07f973b39d5b0eb94291077808 +Subproject commit 40f4f7a48cae491f83bd3cdbf7e9b5a23ed870ef