Merge branch 'develop'

koron · koron · commit d371c3b8bb57 · 2020-07-24T11:03:49.000+09:00
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
-VIM_VER		= 8.2.1233
-PATCHSET_VER	= 20200718
+VIM_VER		= 8.2.1287
+PATCHSET_VER	= 20200724
 
 VIM_VER_SHORT	= 82
 
diff --git 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
@@ -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
@@ -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
diff --git a/kaoriya/doc/CHANGES.md b/kaoriya/doc/CHANGES.md
@@ -1,3 +1,11 @@
+## 2020/07/24 の変更点
+
+*   ベースコードを8.2.1287に更新しました
+*   既知の問題: 特に無し
+*   テストは全て通過しました
+
+    詳細: <https://gist.github.com/koron/1f049d065c7146a11b2689d5372d3d7b>
+
 ## 2020/07/18 の変更点
 
 *   ベースコードを8.2.1233に更新しました
diff --git a/patches b/patches
@@ -1 +1 @@
-Subproject commit 58ab9724bf214ceefbda95b7f2f2cba92dbabcba
+Subproject commit bfdd5cb01600bac9cd92b6f2d114993c71b1136e
diff --git a/vim b/vim
@@ -1 +1 @@
-Subproject commit f0b9f43c3169037b7f2cd70e4939ba1ef26ada1c
+Subproject commit 40f4f7a48cae491f83bd3cdbf7e9b5a23ed870ef
