Merge branch 'vim-kaoriya' into kaoriya

Conflicts:
	CHANGES_kaoriya.txt
	README_kaoriya.txt
	plugins/kaoriya/plugin/cmdex.vim
	plugins/kaoriya/plugin/dicwin.vim
	plugins/kaoriya/plugin/verifyenc.vim
	plugins/kaoriya/syntax/memo.vim
	plugins/vimdoc-ja/doc/autocmd.jax
	plugins/vimdoc-ja/doc/change.jax
	plugins/vimdoc-ja/doc/cmdline.jax
	plugins/vimdoc-ja/doc/diff.jax
	plugins/vimdoc-ja/doc/eval.jax
	plugins/vimdoc-ja/doc/gui_w16.jax
	plugins/vimdoc-ja/doc/gui_w32.jax
	plugins/vimdoc-ja/doc/help.jax
	plugins/vimdoc-ja/doc/helphelp.jax
	plugins/vimdoc-ja/doc/howto.jax
	plugins/vimdoc-ja/doc/if_mzsch.jax
	plugins/vimdoc-ja/doc/if_perl.jax
	plugins/vimdoc-ja/doc/if_pyth.jax
	plugins/vimdoc-ja/doc/if_ruby.jax
	plugins/vimdoc-ja/doc/if_sniff.jax
	plugins/vimdoc-ja/doc/if_tcl.jax
	plugins/vimdoc-ja/doc/index.jax
	plugins/vimdoc-ja/doc/insert.jax
	plugins/vimdoc-ja/doc/intro.jax
	plugins/vimdoc-ja/doc/mbyte.jax
	plugins/vimdoc-ja/doc/motion.jax
	plugins/vimdoc-ja/doc/options.jax
	plugins/vimdoc-ja/doc/pattern.jax
	plugins/vimdoc-ja/doc/pi_netrw.jax
	plugins/vimdoc-ja/doc/quickref.jax
	plugins/vimdoc-ja/doc/syntax.jax
	plugins/vimdoc-ja/doc/uganda.jax
	plugins/vimdoc-ja/doc/usr_05.jax
	plugins/vimdoc-ja/doc/usr_08.jax
	plugins/vimdoc-ja/doc/usr_21.jax
	plugins/vimdoc-ja/doc/usr_22.jax
	plugins/vimdoc-ja/doc/usr_28.jax
	plugins/vimdoc-ja/doc/usr_41.jax
	plugins/vimdoc-ja/doc/usr_toc.jax
	plugins/vimdoc-ja/doc/various.jax
	plugins/vimdoc-ja/doc/visual.jax
	plugins/vimdoc-ja/doc/windows.jax
	runtime/doc/eval.txt
	runtime/doc/options.txt
	src/gui_w48.c
	src/po/ja.po
	src/po/ja.sjis.po

Author: splhack

.hgtags

@@ -2097,3 +2097,92 @@ d149f18b289fdf19363214e7805a0637307bd264 v7-3-751
 ed936effb1f374004db15f092b8c8ab87631fdd4 v7-3-752
 c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
 beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
+d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
+706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
+65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
+9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
+25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
+8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
+6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
+699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
+b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
+b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
+915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
+b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
+be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
+9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
+d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
+da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
+3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
+d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
+3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
+a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
+a6e60677aea727622dde15d1306c61588b805500 v7-3-775
+80b041b994d156360992666110964e74f7473d3e v7-3-776
+9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
+562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
+2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
+42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
+29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
+0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
+a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
+fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
+be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
+8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
+e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
+386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
+43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
+8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
+16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
+7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
+fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
+9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
+17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
+2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
+0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
+cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
+5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
+c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
+48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
+cd5145d2408bb52217417af654f5664af269e19e v7-3-802
+77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
+2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804
+dc30c01f995623e65ee6651a46b12ff062df8860 v7-3-805
+f7e3f87ac9928df0079741258a3c6034ecc48806 v7-3-806
+1efc30385c417bb413f5199253edca2795f9da0e v7-3-807
+3b2a771abb39f670269b0ee9c4041bf02c2d5b84 v7-3-808
+918d7df425afb77261428968ae646efb95b15224 v7-3-809
+8904ccd5ee85ff326a05530c02cc90e1260f768a v7-3-810
+ad21448af931b3923d9b76e4efdcf0e966c9d199 v7-3-811
+4584e59860b8db6fc5870f0b8f0425f540ea90a7 v7-3-812
+4e6e012af15028dde0f55bd9bc676bbb14e481ff v7-3-813
+d5b1d6177b374bbecfbd5c75fbce28e148eeecea v7-3-814
+448a6e7cf32e14a4adcbc4066743e2f058f7e1c0 v7-3-815
+2b340e5c5baaf66015f3367208d9bf22ce1dfc8e v7-3-816
+01fa9313d4b560997234b94b2408e6bf64808afc v7-3-817
+ad7b6062a7f4041b736d45c5f045671d60eb782f v7-3-818
+36fd800b8c6c527c75bfe285d0ed0c3bc1cf45f7 v7-3-819
+688da4d486a019afa3565ffc553af6ee1a4e67d8 v7-3-820
+4936ee89b4bcfaa33f74114bd07f20af382af14d v7-3-821
+2f7883063b19039840a4a73fa227f6f42b9e3281 v7-3-822
+db401e5e4c5d868b7848486c84521f047dc04b01 v7-3-823
+f5ef9b9c18cd9345eca783fb0c6d4ed50e215cb8 v7-3-824
+6b1f3fc893cdb6d0a4fff5997cc8ff083940e727 v7-3-825
+646cb6b6ff2372c26cb9dc9ef1a0f8d562204950 v7-3-826
+5e17a12a3b1438a7ce044db02d9916ef36e404a9 v7-3-827
+13170a796134824375a42e77af4ff012ceed2b5a v7-3-828
+7728d626ae038dedbf3347508238ef3ab4216a9e v7-3-829
+454d35a4339251adf125de78a8a98d99105533eb v7-3-830
+cb185366f5c84852a7221ed6d9b274a7239ad06d v7-3-831
+670e576a58d19c2033877d26b4338873d8a7db12 v7-3-832
+b971097606032c6fceb961fd559121d5bd74a260 v7-3-833
+3ac9d7d8274e669d10178c4d95eac55080ee0ea5 v7-3-834
+d356b5ce84ceac41b036136807ebe887208fb6f0 v7-3-835
+ff193256398a81a520b44c67d661eee36c64ee95 v7-3-836
+14698f63de8db5b034939aa66b7076ab76bcd529 v7-3-837
+1c819b05529cbbc39982513271499e0217382124 v7-3-838
+2030aca407edf6c865114f459bf2d5d79adea390 v7-3-839
+1778d51fcbc37e819c305b860f98c949915d35eb v7-3-840
+b40e6a47ee53789e91b57c04d9ee7328fa9237d5 v7-3-841
+78321dcaa8e263cdf408f7880530b7aea7401a49 v7-3-842
+f4960ddda07ce46a098d9106ac1b22fd0f6d0f0a v7-3-843

CHANGES_kaoriya.txt

@@ -1,3 +1,65 @@
+=== 20130224�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.831�ɍX�V���܂���
+  * vimdoc-ja��(2013/02/20��)�ɍX�V���܂���
+  * menu���̃O���[�o���ϐ������[�J���ϐ��ɏC�����܂���
+    (https://github.com/vim-jp/issues/issues/312)
+  * ja.po ���X�V�E�C�����܂���
+    (https://bitbucket.org/koron/vim-kaoriya-vim/issue/1)
+
+=== 20130214�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.816�ɍX�V���܂���
+  * vimdoc-ja��(2013/02/10��)�ɍX�V���܂���
+
+=== 20130210�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.806�ɍX�V���܂���
+  * Tutorial�R�}���h���C�����܂���
+    (https://github.com/vim-jp/issues/issues/303)
+
+=== 20130131�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.797�ɍX�V���܂���
+  * �A�g����e������o�[�W�����A�b�v���܂���
+    * Python 3.2.x -> 3.3.x
+
+=== 20130126�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.785�ɍX�V���܂���
+
+=== 20130124�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.782�ɍX�V���܂���
+
+=== 20130118�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.772�ɍX�V���܂���
+  * syntax/memo.vim ���X�V���܂���
+  * README.txt ���X�V���܂��� (URL�̒lj��A�ύX�Ȃ�)
+
+=== 20130111�̕ύX�_ ===
+
+  * verifyenc.vim ���C�����܂���
+    * https://github.com/vim-jp/issues/issues/292
+    * ���̑�
+  * VS2012�ɑΉ����鏀�����J�n���܂���
+  * ja.po ���C���E�X�V���܂��� (https://github.com/vim-jp/issues/issues/288)
+  * ���{�ꃁ�j���[���X�V���܂��� (https://github.com/vim-jp/issues/issues/289)
+  * vimdoc-ja��(2012/12/25��)�ɍX�V���܂���
+
+=== 20121226�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.762�ɍX�V���܂���
+  * c_<C-X> �̌y���Ȗ����C�����܂���
+  * dicwin.vim��noshellslash�‹��ł̓�����C�����܂���
+
+=== 20121213�̕ύX�_ ===
+
+  * �x�[�X�R�[�h��7.3.761�ɍX�V���܂���
+  * vimproc�𓯍����܂���
+  * vimdoc-ja��(2012/12/05��)�ɍX�V���܂���
+
 === 20121206�̕ύX�_ ===
 
   * �x�[�X�R�[�h��7.3.753�ɍX�V���܂���

Filelist

@@ -73,6 +73,7 @@ SRC_ALL =	\
 		src/version.c \
 		src/version.h \
 		src/vim.h \
+		src/winclip.c \
 		src/window.c \
 		src/xxd/xxd.c \
 		src/main.aap \
@@ -83,6 +84,7 @@ SRC_ALL =	\
 		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
 		src/proto.h \
+		src/proto/arabic.pro \
 		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
 		src/proto/charset.pro \
@@ -130,6 +132,7 @@ SRC_ALL =	\
 		src/proto/ui.pro \
 		src/proto/undo.pro \
 		src/proto/version.pro \
+		src/proto/winclip.pro \
 		src/proto/window.pro \
 
 
@@ -444,6 +447,7 @@ SRC_EXTRA =	\
 		src/os_beos.c \
 		src/os_beos.h \
 		src/os_beos.rsrc \
+		src/proto/os_beos.pro \
 		src/os_mint.h \
 		src/os_vms_fix.com \
 		src/toolbar.phi \

README_kaoriya.txt

@@ -3,7 +3,7 @@
                                                          Version: 1.6.6
                                                           Author: MURAOKA Taro
                                                            Since: 23-Aug-1999
-                                                     Last Change: 01-Dec-2012.
+                                                     Last Change: 30-Jan-2013.
 
 �T�v
   Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
@@ -94,7 +94,7 @@ Vim
   Python3�Ƃ̘A�g
     ����: Python3���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
 
-    Python.org�ɂ����J����Ă���Python 3.2���C���X�g�[�����邱�ƂŁAPython�C
+    Python.org�ɂ����J����Ă���Python 3.3���C���X�g�[�����邱�ƂŁAPython�C
     ���^�[�t�F�[�X���g�p���邱�Ƃ��ł��܂��BPython���C���X�g�[�����Ă��Ȃ��ꍇ
     �́APython�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BPython�C���^�[�t�F�[�X
     �̏ڍׂɂ‚��Ă�":help python3"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă�����
@@ -123,7 +123,7 @@ Vim
     ����: Ruby���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
 
     Ruby-mswin32��1.9.2���C���X�g�[�����邱�ƂŁARuby�C���^�[�t�F�[�X�𗘗p��
-    ���܂��BRuby���C���X�g�[�����Ă��Ȃ��ꍇ�́ARuby�C���^�[�t�F�[�G�X�͎����I
+    ���܂��BRuby���C���X�g�[�����Ă��Ȃ��ꍇ�́ARuby�C���^�[�t�F�[�X�͎����I
     �ɖ����ƂȂ�܂��BRuby�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�":help ruby"�Ƃ���
     Vim�t���̃}�j���A�����Q�Ƃ��Ă��������B
 
@@ -172,7 +172,7 @@ Vim
   Mercurial ���|�W�g��
     bitbucket.org�ɂ�3�‚̃��|�W�g�������J���Ă��܂��B
 
-    - vim-kaoriya: �r���h�v�X�N���v�g��
+    - vim-kaoriya: �r���h�p�X�N���v�g��
       https://bitbucket.org/koron/vim-kaoriya
     - vim-kaoriya-vim: vim+kaoriya�p�b�`��clone
       https://bitbucket.org/koron/vim-kaoriya-vim
@@ -210,10 +210,11 @@ Vim
       http://www.vim.org/
   - Vim�̓��{�R�~���j�e�Bvim-jp
       http://vim-jp.org/
+      https://github.com/vim-jp/issues/issues (�o�O�񍐁A�@�\�v�])
   - vim_jp Google �O���[�v
       http://groups.google.com/group/vim_jp/?hl=ja
   - Vim�h�L�������g�|��(vimdoc-ja)
-      http://code.google.com/p/vimdoc-ja/?hl=ja
+      https://github.com/vim-jp/vimdoc-ja/
   - ���艮�Ń����e�i
       http://www.kaoriya.net/software/vim
       MURAOKA Taro <[email protected]>

plugins/kaoriya/plugin/cmdex.vim

@@ -3,7 +3,7 @@
 " cmdex.vim - Extra coomands
 "
 " Maintainer:	Muraoka Taro <[email protected]>
-" Last Change:	24-Nov-2012.
+" Last Change:	10-Feb-2013.
 " Commands:
 "		:MenuLang {language}
 "		    (language: none/ja/zh...etc.)
@@ -60,7 +60,7 @@ function! s:StartTutorial()
     let enc = 'utf-8'
     if &encoding ==# 'cp932'
       let enc='sjis'
-    else if &encoding =~ 'euc'
+    elseif &encoding =~ 'euc'
       let enc = 'euc'
     endif
     let tutor = tutor . '.' . enc
@@ -113,17 +113,17 @@ endfunction
 
 " c_CTRL-X
 "   Input current buffer's directory on command line.
-cnoremap <C-X> <C-R>=<SID>GetBufferDirectory()<CR>/
+cnoremap <C-X> <C-R>=<SID>GetBufferDirectory()<CR>
 function! s:GetBufferDirectory()
   let path = expand('%:p:h')
   let cwd = getcwd()
-  if match(path, cwd) != 0
-    return path
+  let dir = '.'
+  if match(path, escape(cwd, '\')) != 0
+    let dir = path
   elseif strlen(path) > strlen(cwd)
-    return strpart(path, strlen(cwd) + 1)
-  else
-    return '.'
+    let dir = strpart(path, strlen(cwd) + 1)
   endif
+  return dir . (&shellslash ? '/' : '\')
 endfunction
 
 " :Undiff

plugins/kaoriya/plugin/dicwin.vim

@@ -3,7 +3,7 @@
 " dicwin.vim - Dictionary window
 "
 " Maintainer:	MURAOKA Taro <[email protected]>
-" Last Change:	01-May-2012.
+" Last Change:	26-Dec-2012.
 " Commands:	<C-k><C-k>  Search word under cursor.
 "		<C-k>/	    Search prompted word.
 "		<C-k>c	    Close dictionary window.
@@ -235,11 +235,14 @@ function! s:OpenDictionaryWindow(name)
     return
   endif
   if s:GoDictWindow() < 0
+    if &shellslash == 0
+      let name = substitute(a:name, '\\', '/', 'g')
+    endif
     execute "augroup Dictionary"
     execute "autocmd!"
-    execute "autocmd WinEnter " . a:name . " call <SID>DicWinEnter()"
-    execute "autocmd WinLeave " . a:name . " call <SID>DicWinLeave()"
-    execute "autocmd BufUnload " . a:name . " call <SID>DicWinUnload()"
+    execute "autocmd WinEnter " . name . " call <SID>DicWinEnter()"
+    execute "autocmd WinLeave " . name . " call <SID>DicWinLeave()"
+    execute "autocmd BufUnload " . name . " call <SID>DicWinUnload()"
     execute "augroup END"
     execute 'silent normal! :sview ' . a:name ."\<CR>"
     let w:dicwin_dicwin = 1