Skip to content

Commit 0c9abb7

Browse files
committed
Merge branch 'kaoriya'
Conflicts: runtime/doc/gui.txt runtime/syntax/vim.vim src/auto/configure src/configure.in src/eval.c src/feature.h src/gui_w48.c src/if_perl.xs src/if_python.c src/if_ruby.c src/misc1.c src/normal.c src/po/Makefile src/po/ja.po src/vim.h
2 parents 60b00e9 + e2f5728 commit 0c9abb7

File tree

557 files changed

+73336
-19335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

557 files changed

+73336
-19335
lines changed

.hgignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ gvimext.lib
4747
*.mo
4848
*.swp
4949
*~
50+
*.pyc
5051
src/po/vim.pot
5152

5253
# Generated by "make test"
@@ -57,6 +58,7 @@ src/testdir/lua.vim
5758
src/testdir/small.vim
5859
src/testdir/tiny.vim
5960
src/testdir/test*.out
61+
src/testdir/test.log
6062

6163
# KaoriYa
6264
src/*.lib

.hgtags

Lines changed: 417 additions & 0 deletions
Large diffs are not rendered by default.

CHANGES_kaoriya.txt

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,177 @@
1+
=== 20130616�̕ύX�_ ===
2+
3+
* �x�[�X�R�[�h��7.3.1203�ɍX�V���܂���
4+
* contrib�X�V
5+
* vimdoc-ja��(2013-06-07 f927b91)�ɍX�V���܂���
6+
* vimproc��(2013-06-15 03d43b4)�ɍX�V���܂���
7+
* LuaJIT��(2013-06-03 1fa97be)�ɍX�V���܂���
8+
9+
=== 20130523�̕ύX�_ ===
10+
11+
* �x�[�X�R�[�h��7.3.1005�ɍX�V���܂���
12+
* �x�[�^�ň����ł�
13+
* �R���p�C�����Ɏg�p����Python���A�b�v�f�[�g���܂���
14+
* 3.3.1 -> 3.3.2
15+
* 2.7.4 -> 2.7.5
16+
* contrib�X�V
17+
* vimproc��(2013-05-23 db310f7)�ɍX�V���܂���
18+
* LuaJIT��(2013-05-22 6f451c6)�ɍX�V���܂���
19+
20+
=== 20130519�̕ύX�_ ===
21+
22+
* �x�[�X�R�[�h��7.3.969�ɍX�V���܂���
23+
* ���{�ꃊ�\�[�X���C�����܂���
24+
* ja.po��UTF-8�ɕύX���܂���
25+
* �R���p�C�����Ɏg�p����Ruby��2.0.0-p195�ɃA�b�v�f�[�g���܂���
26+
* contrib�X�V
27+
* vimdoc-ja��(2013-05-17 11c2209)�ɍX�V���܂���
28+
* vimproc��(2013-05-17 a9543d7)�ɍX�V���܂���
29+
* LuaJIT��(2013-05-16 a946f67)�ɍX�V���܂���
30+
* plugins/golang��go-1.1�ɍX�V���܂���
31+
32+
=== 20130512�̕ύX�_ ===
33+
34+
* �x�[�X�R�[�h��7.3.935�ɍX�V���܂���
35+
* switches��disable-vimproc.vim(����vimproc�̖�����)��lj����܂���
36+
* $VIM/switches/enabled�ɒu���Ƌ@�\���܂�
37+
* ���{�ꃊ�\�[�X���C�����܂���
38+
* menu����u�G���R�[�h�w��v�̍��ڂ��폜���܂���
39+
* ���b�Z�[�W�t�@�C��ja.po��7.4�Ɍ��������̂ɍ����ւ��܂���
40+
* vimdoc-ja��(2013-05-11 6b48054)�ɍX�V���܂���
41+
* vimproc��(2013-05-11 11c1125)�ɍX�V���܂���
42+
* LuaJIT��(2013-05-08 bb2cc1d)�ɍX�V���܂���
43+
44+
=== 20130505�̕ύX�_ ===
45+
46+
* �x�[�X�R�[�h��7.3.923�ɍX�V���܂���
47+
* �R���p�C�����Ɏg�p����Ruby��2.0.0-p0�ɃA�b�v�f�[�g���܂���
48+
* go-1.0.3��misc/vim��plugins/golang�Ƃ��ē������܂���
49+
* �`��֘A�̃p�b�`��K�p����悤�ɕύX(X0001,X0002)
50+
* vimdoc-ja��(2013-05-01 aae2510)�ɍX�V���܂���
51+
* vimproc��(2013-05-01 8720182)�ɍX�V���܂���
52+
* LuaJIT��(2013-05-02 2be1c26)�ɍX�V���܂���
53+
54+
=== 20130427�̕ύX�_ ===
55+
56+
* �x�[�X�R�[�h��7.3.918�ɍX�V���܂���
57+
* enc=utf-8�̎���fencs����ucs-2le��ucs-2���O���܂���
58+
* �R���p�C�����Ɏg�p����Perl��5.16.3�ɃA�b�v�f�[�g���܂���
59+
* vimdoc-ja��(2013-04-26 9793528)�ɍX�V���܂���
60+
* LuaJIT��(2013-04-27 1ae3e52)�ɍX�V���܂���
61+
62+
=== 20130421�̕ύX�_ ===
63+
64+
* �x�[�X�R�[�h��7.3.905�ɍX�V���܂���
65+
* �R���p�C�����Ɏg�p����Python���A�b�v�f�[�g���܂���
66+
* 3.3.0 -> 3.3.1
67+
* 2.7.3 -> 2.7.4
68+
* �K�p���Ă��Ȃ������p�b�`������
69+
* vimproc��(2013-04-21 c998c0a)�ɍX�V���܂���
70+
* LuaJIT��(2013-04-21 5f1781a)�ɍX�V���܂���
71+
72+
=== 20130414�̕ύX�_ ===
73+
74+
* �x�[�X�R�[�h��7.3.888�ɍX�V���܂���
75+
* ��������p�b�`���@�\�P�ʂɃt�@�C���𕪂��܂���
76+
* �Â��p�b�`�𐮗����܂���
77+
* �p�b�`�� mq �ŊǗ�����悤�ɕύX���܂���
78+
(https://bitbucket.org/koron/vim-kaoriya-patches)
79+
* vimdoc-ja��(2013-04-08 c7dacf0)�ɍX�V���܂���
80+
* vimproc��(2013-04-10 1388fca)�ɍX�V���܂���
81+
* LuaJIT��(2013-04-09 e92e29d)�ɍX�V���܂���
82+
83+
=== 20130406�̕ύX�_ ===
84+
85+
* �x�[�X�R�[�h��7.3.882�ɍX�V���܂���
86+
* Lua��LuaJIT�ɕύX��DLL���o���h������悤�ɂ��܂���
87+
* vimdoc-ja��tags-ja��lj����܂���
88+
* vimdoc-ja��(2013-03-31 cc25368)�ɍX�V���܂���
89+
* vimproc��(2013-03-31 4579e6a)�ɍX�V���܂���
90+
* LuaJIT��(2013-04-05 48912a2)�ɍX�V���܂���
91+
92+
=== 20130324�̕ύX�_ ===
93+
94+
* �x�[�X�R�[�h��7.3.875�ɍX�V���܂���
95+
* Linux�ł�c_CTRL-X�̓�����C�����܂���
96+
* vimproc��(2013-03-23 02259ba)�ɍX�V���܂���
97+
* vimdoc-ja��(2013-03-22 9377b51)�ɍX�V���܂���
98+
99+
=== 20130317�̕ύX�_ ===
100+
101+
* �x�[�X�R�[�h��7.3.865�ɍX�V���܂���
102+
* vimdoc-ja��(2013/03/17��)�ɍX�V���܂���
103+
* autofmt��(2013/03/07�� 476f06a8d2)�ɍX�V���܂���
104+
* libiconv�� https://github.com/koron/libiconv �֍����ւ��܂���
105+
106+
=== 20130310�̕ύX�_ ===
107+
108+
* �x�[�X�R�[�h��7.3.854�ɍX�V���܂���
109+
* fenc=guess�̓��쎞��b:x_guessed_fileencoding��ݒ肷��悤�ɂ��܂���
110+
* verifyenc���ŐV�łɍX�V���܂���
111+
(https://github.com/koron/verifyenc-vim/commit/93ede74)
112+
113+
=== 20130224�̕ύX�_ ===
114+
115+
* �x�[�X�R�[�h��7.3.831�ɍX�V���܂���
116+
* vimdoc-ja��(2013/02/20��)�ɍX�V���܂���
117+
* menu���̃O���[�o���ϐ������[�J���ϐ��ɏC�����܂���
118+
(https://github.com/vim-jp/issues/issues/312)
119+
* ja.po ���X�V�E�C�����܂���
120+
(https://bitbucket.org/koron/vim-kaoriya-vim/issue/1)
121+
122+
=== 20130214�̕ύX�_ ===
123+
124+
* �x�[�X�R�[�h��7.3.816�ɍX�V���܂���
125+
* vimdoc-ja��(2013/02/10��)�ɍX�V���܂���
126+
127+
=== 20130210�̕ύX�_ ===
128+
129+
* �x�[�X�R�[�h��7.3.806�ɍX�V���܂���
130+
* Tutorial�R�}���h���C�����܂���
131+
(https://github.com/vim-jp/issues/issues/303)
132+
133+
=== 20130131�̕ύX�_ ===
134+
135+
* �x�[�X�R�[�h��7.3.797�ɍX�V���܂���
136+
* �A�g����e������o�[�W�����A�b�v���܂���
137+
* Python 3.2.x -> 3.3.x
138+
139+
=== 20130126�̕ύX�_ ===
140+
141+
* �x�[�X�R�[�h��7.3.785�ɍX�V���܂���
142+
143+
=== 20130124�̕ύX�_ ===
144+
145+
* �x�[�X�R�[�h��7.3.782�ɍX�V���܂���
146+
147+
=== 20130118�̕ύX�_ ===
148+
149+
* �x�[�X�R�[�h��7.3.772�ɍX�V���܂���
150+
* syntax/memo.vim ���X�V���܂���
151+
* README.txt ���X�V���܂��� (URL�̒lj��A�ύX�Ȃ�)
152+
153+
=== 20130111�̕ύX�_ ===
154+
155+
* verifyenc.vim ���C�����܂���
156+
* https://github.com/vim-jp/issues/issues/292
157+
* ���̑�
158+
* VS2012�ɑΉ����鏀�����J�n���܂���
159+
* ja.po ���C���E�X�V���܂��� (https://github.com/vim-jp/issues/issues/288)
160+
* ���{�ꃁ�j���[���X�V���܂��� (https://github.com/vim-jp/issues/issues/289)
161+
* vimdoc-ja��(2012/12/25��)�ɍX�V���܂���
162+
163+
=== 20121226�̕ύX�_ ===
164+
165+
* �x�[�X�R�[�h��7.3.762�ɍX�V���܂���
166+
* c_<C-X> �̌y���Ȗ����C�����܂���
167+
* dicwin.vim��noshellslash�‹��ł̓�����C�����܂���
168+
169+
=== 20121213�̕ύX�_ ===
170+
171+
* �x�[�X�R�[�h��7.3.761�ɍX�V���܂���
172+
* vimproc�𓯍����܂���
173+
* vimdoc-ja��(2012/12/05��)�ɍX�V���܂���
174+
1175
=== 20121206�̕ύX�_ ===
2176

3177
* �x�[�X�R�[�h��7.3.753�ɍX�V���܂���

Filelist

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SRC_ALL = \
5757
src/popupmnu.c \
5858
src/quickfix.c \
5959
src/regexp.c \
60+
src/regexp_nfa.c \
6061
src/regexp.h \
6162
src/screen.c \
6263
src/search.c \
@@ -73,6 +74,7 @@ SRC_ALL = \
7374
src/version.c \
7475
src/version.h \
7576
src/vim.h \
77+
src/winclip.c \
7678
src/window.c \
7779
src/xxd/xxd.c \
7880
src/main.aap \
@@ -82,6 +84,11 @@ SRC_ALL = \
8284
src/testdir/test49.vim \
8385
src/testdir/test60.vim \
8486
src/testdir/test83-tags? \
87+
src/testdir/python2/*.py \
88+
src/testdir/python3/*.py \
89+
src/testdir/pythonx/*.py \
90+
src/testdir/python_after/*.py \
91+
src/testdir/python_before/*.py \
8592
src/proto.h \
8693
src/proto/blowfish.pro \
8794
src/proto/buffer.pro \
@@ -130,6 +137,7 @@ SRC_ALL = \
130137
src/proto/ui.pro \
131138
src/proto/undo.pro \
132139
src/proto/version.pro \
140+
src/proto/winclip.pro \
133141
src/proto/window.pro \
134142

135143

@@ -444,6 +452,7 @@ SRC_EXTRA = \
444452
src/os_beos.c \
445453
src/os_beos.h \
446454
src/os_beos.rsrc \
455+
src/proto/os_beos.pro \
447456
src/os_mint.h \
448457
src/os_vms_fix.com \
449458
src/toolbar.phi \

README_kaoriya.txt

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Vim version 7.3 ���艮�� �����}�j���A��
22

3-
Version: 1.6.6
3+
Version: 1.7.3
44
Author: MURAOKA Taro
55
Since: 23-Aug-1999
6-
Last Change: 01-Dec-2012.
6+
Last Change: 16-Jun-2013.
77

88
�T�v
99
Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
@@ -15,7 +15,6 @@
1515
�����[�X�ɂ�32bit�ł�64bit�ł�����܂��B32bit OS�ł͕K��32bit�ł������p����
1616
�����B64bit OS�ł�64bit�ł�32bit�łǂ���ł������p���������܂��B
1717

18-
1918
�C���X�g�[�����@
2019
�z�z�t�@�C����ZIP���ɂł��B�z�z�t�@�C���ɂ�Vim�v���O�����t�H���_���i�[�����
2120
����̂ŁA�𓀂��ăV�X�e�����̍D���ȏꏊ�ɔz�u���Ă��������B
@@ -61,6 +60,14 @@ Vim
6160
- ctags�I���W�i���T�C�g
6261
http://ctags.sourceforge.net/
6362

63+
Lua�Ƃ̘A�g
64+
KaoriYa�łɂ�Lua (LuaJIT)���o���h������Ă���̂ŁALua�C���^�[�t�F�[�X�͎�
65+
���I�ɗL���ɂȂ�܂��BLua�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�":help lua"�Ƃ���
66+
Vim�t���̃}�j���A�����Q�Ƃ��Ă��������B
67+
68+
- LuaJIT �T�C�g
69+
http://luajit.org/
70+
6471
Perl(ActivePerl)�Ƃ̘A�g
6572
����: Perl���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
6673

@@ -94,7 +101,7 @@ Vim
94101
Python3�Ƃ̘A�g
95102
����: Python3���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
96103

97-
Python.org�ɂ����J����Ă���Python 3.2���C���X�g�[�����邱�ƂŁAPython�C
104+
Python.org�ɂ����J����Ă���Python 3.3���C���X�g�[�����邱�ƂŁAPython�C
98105
���^�[�t�F�[�X���g�p���邱�Ƃ��ł��܂��BPython���C���X�g�[�����Ă��Ȃ��ꍇ
99106
�́APython�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BPython�C���^�[�t�F�[�X
100107
�̏ڍׂɂ‚��Ă�":help python3"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă�����
@@ -106,32 +113,19 @@ Vim
106113
- Python.org
107114
http://www.python.org/
108115

109-
Lua�Ƃ̘A�g
110-
����: Lua���C���X�g�[�����Ȃ��Ă�Vim�͗��p�ł��܂��B
111-
112-
LuaBinaries�ɂ����J����Ă���Lua 5.2.1���C���X�g�[�����邱�ƂŁALua�C��
113-
�^�[�t�F�[�X�𗘗p�ł��܂��BLua���C���X�g�[�����Ă��Ȃ��ꍇ�́ALua�C���^�[
114-
�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BLua�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�
115-
":help lua"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă��������B
116-
117-
- LuaBinaries
118-
http://luabinaries.sourceforge.net/
119-
http://goo.gl/3eqvS (32bit�� DLL)
120-
http://goo.gl/ZTgGV (64bit�� DLL)
121-
122116
Ruby�Ƃ̘A�g
123117
����: Ruby���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
124118

125-
Ruby-mswin32��1.9.2���C���X�g�[�����邱�ƂŁARuby�C���^�[�t�F�[�X�𗘗p�
126-
���܂��BRuby���C���X�g�[�����Ă��Ȃ��ꍇ�́ARuby�C���^�[�t�F�[�G�X�͎����I
127-
ɖ����ƂȂ�܂��BRuby�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�":help ruby"�Ƃ���
128-
Vim�t���̃}�j���A�����Q�Ƃ��Ă��������B
119+
Ruby 2.0.0-p0���C���X�g�[�������Ruby�C���^�[�t�F�[�X�𗘗p�ł��܂��BRuby
120+
���C���X�g�[�����Ă��Ȃ��ꍇ��Ruby�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ��
121+
��BRuby�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�":help ruby"�Ƃ���Vim�t���̃}�j��
122+
�A�����Q�Ƃ��Ă��������B
129123

130124
64bit�ł�Vim���g���ꍇ��64bit�ł�Ruby���A32bit�ł��g���ꍇ��32bit�ł�
131125
Ruby���C���X�g�[�������������B
132126

133-
- Ruby-mswin32 �z�z�T�C�g
134-
http://www.garbagecollect.jp/ruby/mswin32/ja/
127+
- Ruby �z�z�T�C�g
128+
http://rubyinstaller.org/
135129
- Ruby�S�ʂ̏��
136130
http://www.ruby-lang.org/ja/
137131

@@ -165,25 +159,35 @@ Vim
165159

166160
�I���W�i���Ƃ̑���_
167161
�\�[�X����
168-
patch�t�H���_����hg diff�ɂ���Ď擾���������𓯍����Ă��܂��B�����̎g����
169-
����e�Ɋւ��鎿���R�����g�Ȃǂ���܂����獁�艮�Ń����e�i�܂ŘA��������
170-
���B�\�[�X1�s1�s�Ɏ���܂ł̌��؂��劽�}���܂��B
162+
patch�t�H���_���ɍ����𓯍����Ă��܂��B�����̎g��������e�Ɋւ��鎿���R
163+
�����g�Ȃǂ���܂����獁�艮�Ń����e�i�܂ŘA�����������B�\�[�X1�s1�s�Ɏ���
164+
�܂ł̌��؂��劽�}���܂��B
165+
166+
�ȉ��̃��|�W�g���ł͓��p�b�`�̍ŐV�ł����J���Ă��܂��B
167+
168+
- vim-kaoriya-patches: +kaoriya�p�b�`��Mercurial Queue
169+
https://bitbucket.org/koron/vim-kaoriya-patches
170+
171+
patch�t�H���_�y��vim-kaoriya-patches���̖��O��X�Ŏn�܂�p�b�`�͔��Ɏ���
172+
�I�Ȃ��̂ł�����J�łɂ͓K�p����Ă��܂���B�����̂���������䗗���������B
171173

172174
Mercurial ���|�W�g��
173-
bitbucket.org�ɂ�3�‚̃��|�W�g�������J���Ă��܂��B
175+
bitbucket.org�ɂ�2�‚̃��|�W�g�������J���Ă��܂��B
174176

175-
- vim-kaoriya: �r���h�v�X�N���v�g��
177+
- vim-kaoriya: �r���h�p�X�N���v�g��
176178
https://bitbucket.org/koron/vim-kaoriya
177-
- vim-kaoriya-vim: vim+kaoriya�p�b�`��clone
178-
https://bitbucket.org/koron/vim-kaoriya-vim
179-
- vim-kaoriya-vim-mq-ex: �����I�ȃp�b�`�W(Mercurial MQ�p)
180-
https://bitbucket.org/koron/vim-kaoriya-vim-mq-ex
179+
- vim-kaoriya-patches: +kaoriya�p�b�`��Mercurial Queue
180+
https://bitbucket.org/koron/vim-kaoriya-patches
181181

182-
vim-kaoriya �� vim-kaoriya-vim �� hgsub �ɂĎQ�Ƃ��Ă��܂��̂ŁA�ʏ��
183-
vim-kaoriya ������ clone ����Ɨǂ��ł��傤�B
182+
Mercurial�ɂ��\�[�X�ƃp�b�`�̓�����@
183+
���艮�ł̃\�[�X�R�[�h(�y�уp�b�`)��Mercurial���|�W�g������擾����ɂ͈�
184+
���̂悤�ɂ��Ă��������B
184185

185-
vim-kaoriya-vim-mq �� vim-kaoriya-vim �� .hg/patches �����|�W�g����������
186-
�̂ł��B�����̂���������䗗���������B
186+
$ hg qclone https://code.google.com/p/vim/ \
187+
-p https://bitbucket.org/koron/vim-kaoriya-patches
188+
$ cd vim
189+
$ hg qselect -n
190+
$ hg qpush -a
187191

188192
���m�̖��_
189193
* qkc��-nj�t���O�ŃR���o�[�g����JIS�t�@�C���͊J���Ȃ�(iconv.dll)
@@ -210,10 +214,11 @@ Vim
210214
http://www.vim.org/
211215
- Vim�̓��{�R�~���j�e�Bvim-jp
212216
http://vim-jp.org/
217+
https://github.com/vim-jp/issues/issues (�o�O�񍐁A�@�\�v�])
213218
- vim_jp Google �O���[�v
214219
http://groups.google.com/group/vim_jp/?hl=ja
215220
- Vim�h�L�������g�|��(vimdoc-ja)
216-
http://code.google.com/p/vimdoc-ja/?hl=ja
221+
https://github.com/vim-jp/vimdoc-ja/
217222
- ���艮�Ń����e�i
218223
http://www.kaoriya.net/software/vim
219224
MURAOKA Taro <[email protected]>

0 commit comments

Comments
 (0)