catch up 7.4.1320

koron · Feb 15, 2016 · bdfae37 · bdfae37
1 parent 48925cd
commit bdfae37
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/contrib/lang-ja b/contrib/lang-ja
diff --git a/contrib/luajit-2.0 b/contrib/luajit-2.0
diff --git a/contrib/vimdoc-ja b/contrib/vimdoc-ja
diff --git a/contrib/vimproc b/contrib/vimproc
diff --git a/kaoriya/doc/CHANGES.txt b/kaoriya/doc/CHANGES.txt
@@ -1,3 +1,12 @@
+=== 201602XX�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.4.1320�ɍX�V���܂���
+  * contrib �X�V
+    * lang-ja (2016-02-11 c395d28)
+    * LuaJIT (2016-02-10 6cb38f7)
+    * vimdoc-ja (2016-02-14 e0ef658)
+    * vimproc (2016-02-08 6cde85b)
+
 === 20160124�̕ύX�_ ===
 
   * �x�[�X�R�[�h��7.4.1161�ɍX�V���܂���

diff --git a/vim b/vim
+6 −0		.gitignore
+35 −0		CONTRIBUTING.md
+60 −0		Makefile
+97 −4		README.mkd
+51 −0		runtime/doc/evim-ja.UTF-8.1
+49 −0		runtime/doc/evim.1
+501 −0		runtime/doc/vim-ja.UTF-8.1
+553 −0		runtime/doc/vim.1
+44 −0		runtime/doc/vimdiff-ja.UTF-8.1
+46 −0		runtime/doc/vimdiff.1
+45 −0		runtime/doc/vimtutor-ja.UTF-8.1
+57 −0		runtime/doc/vimtutor.1
+382 −0		runtime/doc/xxd-ja.UTF-8.1
+385 −0		runtime/doc/xxd.1
+2 −0		runtime/lang/.gitignore
+22 −0		runtime/lang/Makefile
+0 −306		runtime/lang/menu_ja_jp.euc-jp.vim
+7 −5		runtime/lang/menu_ja_jp.utf-8.vim
+0 −306		runtime/lang/menu_japanese_japan.932.vim
+2 −0		runtime/tutor/.gitignore
+18 −0		runtime/tutor/Makefile
+970 −0		runtime/tutor/tutor
+976 −0		runtime/tutor/tutor.ja.utf-8
+9 −0		src/po/.gitignore
+49 −0		src/po/Makefile
+88 −0		src/po/check.vim
+19 −0		src/po/cleanup.vim
+0 −6,808		src/po/ja.euc-jp.po
+262 −149		src/po/ja.po
+0 −6,808		src/po/ja.sjis.po
+49 −0		src/po/sjiscorr.c
+14 −6		README.md
+21 −3		doc/autocmd.jax
+67 −21		doc/change.jax
+222 −0		doc/channel.jax
+7 −2		doc/cmdline.jax
+3 −3		doc/debugger.jax
+63 −29		doc/develop.jax
+24 −10		doc/editing.jax
+394 −60		doc/eval.jax
+0 −51		doc/evim-ja.UTF-8.1
+1 −1		doc/farsi.jax
+9 −6		doc/filetype.jax
+22 −8		doc/fold.jax
+9 −9		doc/ft_ada.jax
+1 −1		doc/gui.jax
+1 −1		doc/gui_w16.jax
+11 −11		doc/gui_w32.jax
+8 −8		doc/gui_x11.jax
+32 −23		doc/hangulin.jax
+8 −5		doc/help.jax
+2 −2		doc/helphelp.jax
+4 −4		doc/if_cscop.jax
+101 −19		doc/if_lua.jax
+27 −3		doc/if_mzsch.jax
+11 −3		doc/if_perl.jax
+18 −11		doc/if_pyth.jax
+34 −25		doc/if_ruby.jax
+8 −8		doc/if_sniff.jax
+38 −27		doc/if_tcl.jax
+5 −5		doc/indent.jax
+6 −5		doc/index.jax
+43 −21		doc/insert.jax
+4 −4		doc/intro.jax
+34 −17		doc/map.jax
+3 −3		doc/mbyte.jax
+12 −12		doc/message.jax
+8 −5		doc/mlang.jax
+2 −2		doc/motion.jax
+11 −6		doc/netbeans.jax
+286 −87		doc/options.jax
+1 −1		doc/os_390.jax
+5 −5		doc/os_amiga.jax
+4 −4		doc/os_beos.jax
+1 −1		doc/os_mac.jax
+4 −4		doc/os_msdos.jax
+2 −197		doc/os_os2.jax
+2 −2		doc/os_unix.jax
+19 −19		doc/os_vms.jax
+2 −2		doc/os_win32.jax
+22 −11		doc/pattern.jax
+3 −3		doc/pi_getscript.jax
+35 −44		doc/pi_logipat.jax
+848 −375		doc/pi_netrw.jax
+4 −4		doc/pi_spec.jax
+8 −8		doc/print.jax
+15 −15		doc/quickfix.jax
+19 −9		doc/quickref.jax
+6 −6		doc/quotes.jax
+1 −1		doc/recover.jax
+48 −11		doc/repeat.jax
+1 −1		doc/sign.jax
+35 −28		doc/spell.jax
+1 −1		doc/sponsor.jax
+4 −4		doc/starting.jax
+207 −131		doc/syntax.jax
+1 −1		doc/tabpage.jax
+21 −17		doc/tagsrch.jax
+24 −13		doc/term.jax
+23 −23		doc/uganda.jax
+1 −1		doc/undo.jax
+199 −63		doc/usr_02.jax
+7 −4		doc/usr_03.jax
+1 −1		doc/usr_05.jax
+4 −4		doc/usr_06.jax
+2 −2		doc/usr_07.jax
+3 −2		doc/usr_08.jax
+1 −1		doc/usr_09.jax
+2 −2		doc/usr_10.jax
+3 −3		doc/usr_21.jax
+11 −11		doc/usr_22.jax
+4 −4		doc/usr_25.jax
+1 −1		doc/usr_27.jax
+4 −3		doc/usr_29.jax
+2 −2		doc/usr_30.jax
+22 −22		doc/usr_31.jax
+24 −9		doc/usr_41.jax
+5 −5		doc/usr_42.jax
+7 −1		doc/usr_43.jax
+19 −18		doc/usr_44.jax
+1 −1		doc/usr_45.jax
+2 −2		doc/usr_toc.jax
+12 −1		doc/various.jax
+34 −36		doc/vi_diff.jax
+0 −501		doc/vim-ja.UTF-8.1
+0 −44		doc/vimdiff-ja.UTF-8.1
+0 −45		doc/vimtutor-ja.UTF-8.1
+2 −2		doc/visual.jax
+122 −54		doc/windows.jax
+0 −366		doc/xxd-ja.UTF-8.1
+1 −0		Filelist
+60 −34		runtime/doc/channel.txt
+209 −56		runtime/doc/eval.txt
+16 −3		runtime/doc/tags
+55 −16		runtime/doc/todo.txt
+5 −5		runtime/doc/usr_41.txt
+2 −2		runtime/doc/windows.txt
+4 −2		runtime/ftplugin/man.vim
+33 −27		runtime/indent/php.vim
+2 −2		runtime/indent/sh.vim
+25 −17		runtime/syntax/d.vim
+8 −7		runtime/syntax/zsh.vim
+4 −2		src/Make_cyg_ming.mak
+2 −3		src/Make_mvc.mak
+2 −0		src/Makefile
+1,041 −481		src/channel.c
+5 −0		src/edit.c
+775 −199		src/eval.c
+9 −3		src/ex_cmds.c
+18 −0		src/ex_cmds2.c
+4 −0		src/ex_eval.c
+8 −1		src/feature.h
+1 −1		src/fileio.c
+6 −0		src/getchar.c
+2 −0		src/globals.h
+10 −3		src/gui_w48.c
+4 −5		src/if_py_both.h
+7 −0		src/if_python.c
+7 −0		src/if_python3.c
+109 −46		src/json.c
+49 −49		src/json_test.c
+1 −1		src/memfile.c
+1 −1		src/memline.c
+3 −0		src/misc2.c
+17 −17		src/netbeans.c
+295 −76		src/os_unix.c
+154 −18		src/os_win32.c
+28 −16		src/proto/channel.pro
+1 −0		src/proto/ex_cmds2.pro
+5 −5		src/proto/json.pro
+5 −0		src/proto/os_unix.pro
+4 −0		src/proto/os_win32.pro
+9 −4		src/regexp.c
+5 −0		src/regexp_nfa.c
+158 −12		src/structs.h
+3 −0		src/testdir/README.txt
+35 −31		src/testdir/runtest.vim
+3 −0		src/testdir/test36.in
+3 −0		src/testdir/test36.ok
+2 −3		src/testdir/test49.vim
+1 −0		src/testdir/test_alot.vim
+2 −0		src/testdir/test_assert.vim
+125 −55		src/testdir/test_channel.py
+270 −26		src/testdir/test_channel.vim
+24 −0		src/testdir/test_channel_pipe.py
+23 −4		src/testdir/test_cursor_func.vim
+19 −0		src/testdir/test_increment.vim
+187 −67		src/testdir/test_json.vim
+27 −0		src/testdir/test_reltime.vim
+24 −0		src/testdir/test_viml.vim
+155 −0		src/version.c
+11 −9		src/vim.h