Merge branch 'develop'

koron · Jul 24, 2020 · d371c3b · d371c3b
2 parents 2b29fda + 91b7b39
commit d371c3b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
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
diff --git a/vim b/vim
+0 −26		master/iflua-compile-failure.diff
+0 −1		master/series
+9 −9		.travis.yml
+4 −0		Filelist
+11 −6		runtime/doc/eval.txt
+7 −4		runtime/doc/options.txt
+4 −1		runtime/doc/quickfix.txt
+2 −0		src/Make_cyg_ming.mak
+2 −0		src/Make_morph.mak
+8 −0		src/Make_mvc.mak
+12 −0		src/Make_vms.mms
+20 −0		src/Makefile
+2 −0		src/README.md
+9 −2		src/buffer.c
+0 −21		src/channel.c
+0 −56		src/cmdexpand.c
+2 −2		src/cmdhist.c
+16 −9		src/eval.c
+6 −5		src/evalfunc.c
+47 −12		src/evalvars.c
+1 −1,275		src/ex_cmds.c
+0 −502		src/ex_cmds2.c
+51 −19		src/ex_docmd.c
+23 −23		src/ex_eval.c
+1 −0		src/globals.h
+1,295 −0		src/help.c
+8 −2		src/if_lua.c
+1 −1		src/json.c
+564 −0		src/locale.c
+0 −53		src/main.c
+12 −2		src/mark.c
+1 −1		src/match.c
+1 −1		src/menu.c
+7 −1		src/normal.c
+10 −0		src/optionstr.c
+8 −1		src/popupmenu.c
+13 −0		src/popupwin.c
+2 −0		src/proto.h
+1 −0		src/proto/evalvars.pro
+0 −9		src/proto/ex_cmds.pro
+0 −6		src/proto/ex_cmds2.pro
+1 −0		src/proto/ex_docmd.pro
+14 −0		src/proto/help.pro
+9 −0		src/proto/locale.pro
+1 −0		src/proto/popupwin.pro
+1 −0		src/proto/quickfix.pro
+1 −0		src/proto/userfunc.pro
+4 −1		src/proto/vim9compile.pro
+121 −20		src/quickfix.c
+14 −2		src/scriptfile.c
+1 −1		src/sign.c
+1 −0		src/structs.h
+14 −0		src/testdir/dumps/Test_popupwin_infopopup_8.dump
+14 −0		src/testdir/dumps/Test_popupwin_infopopup_9.dump
+18 −0		src/testdir/mouse.vim
+12 −0		src/testdir/runtest.vim
+29 −0		src/testdir/test_autocmd.vim
+0 −9		src/testdir/test_buffer.vim
+3 −0		src/testdir/test_bufwintabinfo.vim
+2 −2		src/testdir/test_let.vim
+29 −19		src/testdir/test_marks.vim
+157 −143		src/testdir/test_netbeans.vim
+0 −18		src/testdir/test_normal.vim
+6 −0		src/testdir/test_popupwin.vim
+58 −10		src/testdir/test_quickfix.vim
+3 −0		src/testdir/test_regexp_utf8.vim
+4 −4		src/testdir/test_system.vim
+23 −0		src/testdir/test_tabline.vim
+23 −23		src/testdir/test_tabpage.vim
+251 −26		src/testdir/test_termcodes.vim
+7 −0		src/testdir/test_terminal.vim
+3 −6		src/testdir/test_terminal3.vim
+42 −1		src/testdir/test_vim9_disassemble.vim
+94 −9		src/testdir/test_vim9_expr.vim
+55 −4		src/testdir/test_vim9_func.vim
+214 −10		src/testdir/test_vim9_script.vim
+10 −2		src/typval.c
+14 −9		src/userfunc.c
+108 −0		src/version.c
+6 −1		src/vim9.h
+269 −88		src/vim9compile.c
+148 −54		src/vim9execute.c
+6 −3		src/vim9script.c