Skip to content

Commit cc3bc15

Browse files
committed
vim73-kaoriya-win64-20130616
1 parent 8d7cf71 commit cc3bc15

File tree

138 files changed

+4950
-1108
lines changed

Some content is hidden

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

138 files changed

+4950
-1108
lines changed

CHANGES_kaoriya.txt

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,115 @@
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+
1113
=== 20130224�̕ύX�_ ===
2114

3115
* �x�[�X�R�[�h��7.3.831�ɍX�V���܂���

README_kaoriya.txt

Lines changed: 40 additions & 36 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: 30-Jan-2013.
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

@@ -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�[�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

175177
- 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
181-
182-
vim-kaoriya �� vim-kaoriya-vim �� hgsub �ɂĎQ�Ƃ��Ă��܂��̂ŁA�ʏ��
183-
vim-kaoriya ������ clone ����Ɨǂ��ł��傤�B
184-
185-
vim-kaoriya-vim-mq �� vim-kaoriya-vim �� .hg/patches �����|�W�g����������
186-
�̂ł��B�����̂���������䗗���������B
179+
- vim-kaoriya-patches: +kaoriya�p�b�`��Mercurial Queue
180+
https://bitbucket.org/koron/vim-kaoriya-patches
181+
182+
Mercurial�ɂ��\�[�X�ƃp�b�`�̓�����@
183+
���艮�ł̃\�[�X�R�[�h(�y�уp�b�`)��Mercurial���|�W�g������擾����ɂ͈�
184+
���̂悤�ɂ��Ă��������B
185+
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)

gvimrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
scriptencoding utf-8
12
" vim:set ts=8 sts=2 sw=2 tw=0: (この行に関しては:help modelineを参照)
23
"
34
" An example for a Japanese version gvimrc file.
45
" 日本語版のデフォルトGUI設定ファイル(gvimrc) - Vim7用試作
56
"
6-
" Last Change: 09-Jan-2011.
7+
" Last Change: 07-May-2013.
78
" Maintainer: MURAOKA Taro <[email protected]>
89
"
910
" 解説:
@@ -173,4 +174,4 @@ if has('printer')
173174
endif
174175
endif
175176

176-
" Copyright (C) 2011 KaoriYa/MURAOKA Taro
177+
" Copyright (C) 2009-2013 KaoriYa/MURAOKA Taro

plugins/autofmt/README

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
see doc/autofmt.txt
1+
This is a 'formatexpr' plugin.
2+
3+
License:
4+
public domain
5+
6+
Usage:
7+
:set runtimepath+=/path/to/autofmt/
8+
:set formatexpr=autofmt#compat#formatexpr()
9+
10+
See doc/autofmt.txt for more information.

plugins/autofmt/autoload/autofmt/compat.vim

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Maintainer: Yukihiro Nakadaira <[email protected]>
22
" License: This file is placed in the public domain.
3-
" Last Change: 2011-05-15
3+
" Last Change: 2012-01-25
44
"
55
" Options:
66
"
@@ -73,7 +73,7 @@
7373
" UAX #11: East Asian Width
7474
" http://unicode.org/reports/tr11/
7575
"
76-
" Ward wrap - Wikipedia
76+
" Word wrap - Wikipedia
7777
" http://en.wikipedia.org/wiki/Word_wrap
7878

7979
let s:cpo_save = &cpo
@@ -210,6 +210,9 @@ function s:lib.format_lines(lnum, count)
210210
let lnum = a:lnum
211211
let prev_lines = line('$')
212212
let fo_2 = self.get_second_line_leader(getline(lnum, lnum + a:count - 1))
213+
" If the line doesn't start with a comment leader, then don't start
214+
" one in a following broken line. (edit.c:internal_format():6063)
215+
let no_leader = !self.is_comment(getline(lnum))
213216
let lines = getline(lnum, lnum + a:count - 1)
214217
let line = self.join_lines(lines)
215218
call setline(lnum, line)
@@ -229,7 +232,7 @@ function s:lib.format_lines(lnum, count)
229232
if fo_2 != -1
230233
let leader = fo_2
231234
else
232-
let leader = self.make_leader(lnum + 1)
235+
let leader = self.make_leader(lnum + 1, no_leader)
233236
endif
234237
call setline(lnum + 1, leader . line2)
235238
let lnum += 1
@@ -502,12 +505,30 @@ function s:lib.parse_leader(line)
502505
if a:line =~# '^\s*$'
503506
return [a:line, "", "", "", ""]
504507
endif
508+
let middle = []
505509
for [flags, str] in self.parse_opt_comments(&comments)
506510
let mx = printf('\v^(\s*)(\V%s\v)(\s%s|$)(.*)$', escape(str, '\'),
507511
\ (flags =~# 'b') ? '+' : '*')
512+
" If we found a middle match previously, use that match when this is
513+
" not a middle or end. */
514+
if !empty(middle) && flags !~# '[me]'
515+
break
516+
endif
508517
if a:line =~# mx
509518
let res = matchlist(a:line, mx)[1:4] + [flags]
510-
if flags =~# 'n'
519+
" We have found a match, stop searching unless this is a middle
520+
" comment. The middle comment can be a substring of the end
521+
" comment in which case it's better to return the length of the
522+
" end comment and its flags. Thus we keep searching with middle
523+
" and end matches and use an end match if it matches better.
524+
if flags =~# 'm'
525+
let middle = res
526+
continue
527+
elseif flags =~# 'e'
528+
if !empty(middle) && strchars(res[1]) <= strchars(middle[1])
529+
let res = middle
530+
endif
531+
elseif flags =~# 'n'
511532
" nested comment
512533
while 1
513534
let [indent, com_str, mindent, text, com_flags] = self.parse_leader(res[3])
@@ -520,6 +541,9 @@ function s:lib.parse_leader(line)
520541
return res
521542
endif
522543
endfor
544+
if !empty(middle)
545+
return middle
546+
endif
523547
return matchlist(a:line, '\v^(\s*)()()(.*)$')[1:4] + [""]
524548
endfunction
525549

@@ -592,10 +616,10 @@ function s:lib.get_second_line_leader(lines)
592616
return -1
593617
endfunction
594618

595-
function s:lib.make_leader(lnum)
619+
function s:lib.make_leader(lnum, no_leader)
596620
let prev_line = getline(a:lnum - 1)
597621

598-
if self.is_comment_enabled() && self.is_comment(prev_line)
622+
if !a:no_leader && self.is_comment_enabled() && self.is_comment(prev_line)
599623
return self.make_comment_leader(prev_line)
600624
endif
601625

plugins/autofmt/autoload/autofmt/uax14.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Maintainer: Yukihiro Nakadaira <[email protected]>
22
" License: This file is placed in the public domain.
3-
" Last Change: 2009-10-04
3+
" Last Change: 2013-03-07
44

55
let s:cpo_save = &cpo
66
set cpo&vim
@@ -18,7 +18,7 @@ let s:compat = autofmt#compat#import()
1818
let s:lib = {}
1919
call extend(s:lib, s:compat)
2020

21-
let s:lib.uni = unicode#import()
21+
let s:lib.uni = autofmt#unicode#import()
2222

2323
function! s:lib.check_boundary(lst, i)
2424
" UAX #14: Line Breaking Properties

0 commit comments

Comments
 (0)