Skip to content

Commit 4f4eac5

Browse files
committed
Merge branch 'vim-v7-3-712' into kaoriya
Conflicts: CHANGES_kaoriya.txt README_kaoriya.txt runtime/syntax/java.vim src/Make_mvc.mak
2 parents cc4c5bc + f4d266f commit 4f4eac5

148 files changed

Lines changed: 5113 additions & 2230 deletions

File tree

Some content is hidden

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

.hgignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ src/auto/pathdef.c
3232
*.suo
3333
*.res
3434
*.RES
35+
src/if_perl.c
3536
src/pathdef.c
3637
src/Obj*/pathdef.c
3738
gvimext.dll
@@ -46,6 +47,7 @@ gvimext.lib
4647
*.mo
4748
*.swp
4849
*~
50+
src/po/vim.pot
4951

5052
# Generated by "make test"
5153
src/po/*.ck

.hgtags

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,3 +1976,82 @@ dc65e6429d2c1b79719455d7303f3f95c5897965 v7-3-627
19761976
99f076ca8d846d553aefd7e626ca938bcf93f259 v7-3-631
19771977
44038a9777aaf0e6502e0eb57b8f7ccf31798ec4 v7-3-632
19781978
ad5fbf3596e0a8ad15c260c5b529efc5ac689e13 v7-3-633
1979+
b7eea24095073d55ac3c59664466b78a0525bebc v7-3-634
1980+
f7f68f83fc335379bc9e3371c5118b8f81c8d5bc v7-3-635
1981+
616bc1ad4f12be0ef37fe67d2f6ed7535f20e515 v7-3-636
1982+
3b62d8f36cdf709d4e0575d63486ebe57ce7150c v7-3-637
1983+
c0256c4bd91ed7b806aab002e4a45e440dd00343 v7-3-638
1984+
1ec385a8faf4002fa300caf370ef2ac380d9702a v7-3-639
1985+
c2c3577021ed4e354853d330e5fc60691d8750c5 v7-3-640
1986+
c068389057c9a89fa351678b5f5776278971dabe v7-3-641
1987+
79ac6744237ce5076a6d2e2b21198dfddc2cc9dd v7-3-642
1988+
fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
1989+
fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
1990+
1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
1991+
e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
1992+
29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
1993+
76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
1994+
063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
1995+
a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
1996+
ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
1997+
5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
1998+
fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
1999+
73557eda70271b49015265b7147562b63a7a094d v7-3-654
2000+
0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
2001+
a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
2002+
3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
2003+
15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
2004+
e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
2005+
8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
2006+
5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
2007+
87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
2008+
2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
2009+
f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
2010+
35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
2011+
1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
2012+
cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
2013+
dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
2014+
2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
2015+
2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
2016+
530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
2017+
fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
2018+
ca1c025079b11c98363e11576d903af756a593fc v7-3-673
2019+
4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
2020+
9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
2021+
5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
2022+
8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
2023+
de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
2024+
dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
2025+
52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
2026+
a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
2027+
8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
2028+
0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
2029+
1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
2030+
34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
2031+
ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
2032+
0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
2033+
2696da84d37093da0dea419878e4241385eb515b v7-3-688
2034+
3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
2035+
caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
2036+
7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
2037+
337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
2038+
fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
2039+
8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
2040+
cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
2041+
447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
2042+
7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
2043+
b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
2044+
4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
2045+
c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
2046+
48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
2047+
916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
2048+
f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
2049+
be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
2050+
0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
2051+
d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
2052+
d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
2053+
64427849c1582299f2af389c6225eead529f0329 v7-3-708
2054+
fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
2055+
906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
2056+
2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711
2057+
557ef119999ea687ccb84eddca295755c24989da v7-3-712

CHANGES_kaoriya.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
=== 20121024�̕ύX�_ ===
2+
3+
* �x�[�X�R�[�h��7.3.712�ɍX�V���܂���
4+
5+
=== 20121022�̕ύX�_ ===
6+
7+
* �x�[�X�R�[�h��7.3.709�ɍX�V���܂���
8+
9+
=== 20121021�̕ύX�_ ===
10+
11+
* �x�[�X�R�[�h��7.3.702�ɍX�V���܂���
12+
13+
=== 20121020�̕ύX�_ ===
14+
15+
* �x�[�X�R�[�h��7.3.692�ɍX�V���܂���
16+
17+
=== 20121004�̕ύX�_ ===
18+
19+
* �x�[�X�R�[�h��7.3.681�ɍX�V���܂���
20+
* ���L�̏C������荞�݂܂���
21+
* ruby�֘A: https://github.com/vim-jp/issues/issues/79
22+
23+
=== 20120926�̕ύX�_ ===
24+
25+
* �x�[�X�R�[�h��7.3.672�ɍX�V���܂���
26+
27+
=== 20120920�̕ύX�_ ===
28+
29+
* �x�[�X�R�[�h��7.3.666�ɍX�V���܂���
30+
* �A�g����e������o�[�W�����A�b�v���܂���
31+
* Perl 5.16.1 (ActivePerl)
32+
* Lua 5.2.1
33+
34+
=== 20120914�̕ύX�_ ===
35+
36+
* �x�[�X�R�[�h��7.3.661�ɍX�V���܂���
37+
* libiconv��X0213�֘A�ŗ���������C��
38+
39+
=== 20120902�̕ύX�_ ===
40+
41+
* �x�[�X�R�[�h��7.3.646�ɍX�V���܂���
42+
143
=== 20120818�̕ύX�_ ===
244

345
* �x�[�X�R�[�h��7.3.633�ɍX�V���܂���

Filelist

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ SRC_DOS = \
261261
src/Make_mvc.mak \
262262
src/Make_w16.mak \
263263
src/bigvim.bat \
264+
src/bigvim64.bat \
264265
src/msvcsetup.bat \
265266
src/msvc2008.bat \
266267
src/msvc2010.bat \
@@ -349,6 +350,13 @@ SRC_DOS_BIN = \
349350
src/vim*.ico \
350351
src/vim.tlb \
351352
src/vimtbar.lib \
353+
src/xpm/COPYRIGHT \
354+
src/xpm/README.txt \
355+
src/xpm/include/*.h \
356+
src/xpm/x64/lib/libXpm.a \
357+
src/xpm/x64/lib/libXpm.lib \
358+
src/xpm/x86/lib/libXpm.a \
359+
src/xpm/x86/lib/libXpm.lib \
352360
src/vimtbar.dll \
353361
nsis/icons/*.bmp \
354362
nsis/icons/*.ico \
@@ -685,9 +693,17 @@ LANG_GEN = \
685693
runtime/tutor/Makefile \
686694
runtime/tutor/tutor.utf-8 \
687695
runtime/tutor/tutor.?? \
688-
runtime/tutor/tutor.??.* \
696+
runtime/tutor/tutor.??.utf-8 \
697+
runtime/tutor/tutor.??.euc \
698+
runtime/tutor/tutor.??.sjis \
699+
runtime/tutor/tutor.??.iso9 \
700+
runtime/tutor/tutor.??.big5 \
701+
runtime/tutor/tutor.??.cp1250 \
702+
runtime/tutor/tutor.??.cp1251 \
703+
runtime/tutor/tutor.??.cp737 \
704+
runtime/tutor/tutor.??_??.utf-8 \
689705
runtime/tutor/tutor.bar \
690-
runtime/tutor/tutor.bar.* \
706+
runtime/tutor/tutor.bar.utf-8 \
691707
runtime/spell/README.txt \
692708
runtime/spell/??/*.diff \
693709
runtime/spell/??/main.aap \

README_kaoriya.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Version: 1.6.6
44
Author: MURAOKA Taro
55
Since: 23-Aug-1999
6-
Last Change: 11-Jan-2012.
6+
Last Change: 20-Sep-2012.
77

88
�T�v
99
Vim��vi�N���[���ɕ��ނ����e�L�X�g�G�f�B�^�ł��B
@@ -64,7 +64,7 @@ Vim
6464
Perl(ActivePerl)�Ƃ̘A�g
6565
����: Perl���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B
6666

67-
ActiveState�Ђɂ����J����Ă���ActivePerl 5.14���C���X�g�[�����邱�ƂŁA
67+
ActiveState�Ђɂ����J����Ă���ActivePerl 5.16���C���X�g�[�����邱�ƂŁA
6868
Perl�C���^�[�t�F�[�X���g�p���邱�Ƃ��ł��܂��BActivePerl���C���X�g�[������
6969
���Ȃ��ꍇ�́APerl�C���^�[�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BPerl�C���^�[
7070
�t�F�[�X�̏ڍׂɂ‚��Ă�":help perl"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă�
@@ -109,13 +109,15 @@ Vim
109109
Lua�Ƃ̘A�g
110110
����: Lua���C���X�g�[�����Ȃ��Ă�Vim�͗��p�ł��܂��B
111111

112-
LuaBinaries�ɂ����J����Ă���Lua 5.1���C���X�g�[�����邱�ƂŁALua�C��
112+
LuaBinaries�ɂ����J����Ă���Lua 5.2.1���C���X�g�[�����邱�ƂŁALua�C��
113113
�^�[�t�F�[�X�𗘗p�ł��܂��BLua���C���X�g�[�����Ă��Ȃ��ꍇ�́ALua�C���^�[
114114
�t�F�[�X�͎����I�ɖ����ƂȂ�܂��BLua�C���^�[�t�F�[�X�̏ڍׂɂ‚��Ă�
115115
":help lua"�Ƃ���Vim�t���̃}�j���A�����Q�Ƃ��Ă��������B
116116

117117
- LuaBinaries
118118
http://luabinaries.sourceforge.net/
119+
http://goo.gl/3eqvS (32bit�� DLL)
120+
http://goo.gl/ZTgGV (64bit�� DLL)
119121

120122
Ruby�Ƃ̘A�g
121123
����: Ruby���C���X�g�[�����Ȃ��Ă�Vim�͎g�p�ł��܂��B

runtime/doc/autocmd.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.3. Last change: 2012 Jul 10
1+
*autocmd.txt* For Vim version 7.3. Last change: 2012 Sep 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -263,8 +263,10 @@ Name triggered by ~
263263
Startup and exit
264264
|VimEnter| after doing all the startup stuff
265265
|GUIEnter| after starting the GUI successfully
266+
|GUIFailed| after starting the GUI failed
266267
|TermResponse| after the terminal response to |t_RV| is received
267268

269+
|QuitPre| when using `:quit`, before deciding whether to quit
268270
|VimLeavePre| before exiting Vim, before writing the viminfo file
269271
|VimLeave| before exiting Vim, after writing the viminfo file
270272

@@ -312,6 +314,7 @@ Name triggered by ~
312314
|SessionLoadPost| after loading a session file
313315

314316
|MenuPopup| just before showing the popup menu
317+
|CompleteDone| after Insert mode completion is done
315318

316319
|User| to be used in combination with ":doautocmd"
317320

runtime/doc/cmdline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim version 7.3. Last change: 2012 Jun 20
1+
*cmdline.txt* For Vim version 7.3. Last change: 2012 Oct 11
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -217,7 +217,7 @@ CTRL-\ e {expr} *c_CTRL-\_e*
217217
:return cmd
218218
:endfunc
219219
< This doesn't work recursively, thus not when already editing
220-
an expression.
220+
an expression. But it is possible to use in a mapping.
221221

222222
*c_CTRL-Y*
223223
CTRL-Y When there is a modeless selection, copy the selection into

runtime/doc/diff.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim version 7.3. Last change: 2012 Aug 08
1+
*diff.txt* For Vim version 7.3. Last change: 2012 Sep 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -86,16 +86,16 @@ diff mode. You could use a construct like this: >
8686
While already in Vim you can start diff mode in three ways.
8787

8888
*E98*
89-
:diffsplit {filename} *:diffs* *:diffsplit*
89+
:diffs[plit] {filename} *:diffs* *:diffsplit*
9090
Open a new window on the file {filename}. The options are set
9191
as for "vimdiff" for the current and the newly opened window.
9292
Also see 'diffexpr'.
9393

9494
*:difft* *:diffthis*
95-
:diffthis Make the current window part of the diff windows. This sets
95+
:difft[his] Make the current window part of the diff windows. This sets
9696
the options like for "vimdiff".
9797

98-
:diffpatch {patchfile} *E816* *:diffp* *:diffpatch*
98+
:diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch*
9999
Use the current buffer, patch it with the diff found in
100100
{patchfile} and open a buffer on the result. The options are
101101
set as for "vimdiff".
@@ -123,9 +123,9 @@ Since the option values are remembered with the buffer, you can edit another
123123
file for a moment and come back to the same file and be in diff mode again.
124124

125125
*:diffo* *:diffoff*
126-
:diffoff Switch off diff mode for the current window.
126+
:diffo[ff] Switch off diff mode for the current window.
127127

128-
:diffoff! Switch off diff mode for the current window and in all windows
128+
:diffo[ff]! Switch off diff mode for the current window and in all windows
129129
in the current tab page where 'diff' is set.
130130

131131
The ":diffoff" command resets the relevant options to their default value.

runtime/doc/eval.txt

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2012 Aug 02
1+
*eval.txt* For Vim version 7.3. Last change: 2012 Oct 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -91,8 +91,8 @@ For boolean operators Numbers are used. Zero is FALSE, non-zero is TRUE.
9191
Note that in the command >
9292
:if "foo"
9393
"foo" is converted to 0, which means FALSE. To test for a non-empty string,
94-
use strlen(): >
95-
:if strlen("foo")
94+
use empty(): >
95+
:if !empty("foo")
9696
< *E745* *E728* *E703* *E729* *E730* *E731*
9797
List, Dictionary and Funcref types are not automatically converted.
9898

@@ -759,7 +759,7 @@ of a |List| is different from the original |List|. When using "is" without
759759
a |List| or a |Dictionary| it is equivalent to using "equal", using "isnot"
760760
equivalent to using "not equal". Except that a different type means the
761761
values are different: "4 == '4'" is true, "4 is '4'" is false and "0 is []" is
762-
false and not a error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
762+
false and not an error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
763763
and ignore case.
764764

765765
When comparing a String with a Number, the String is converted to a Number,
@@ -1932,6 +1932,7 @@ setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
19321932
shellescape( {string} [, {special}])
19331933
String escape {string} for use as shell
19341934
command argument
1935+
shiftwidth() Number effective value of 'shiftwidth'
19351936
simplify( {filename}) String simplify filename as much as possible
19361937
sin( {expr}) Float sine of {expr}
19371938
sinh( {expr}) Float hyperbolic sine of {expr}
@@ -3754,10 +3755,10 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]]) *inputdialog()*
37543755
Like |input()|, but when the GUI is running and text dialogs
37553756
are supported, a dialog window pops up to input the text.
37563757
Example: >
3757-
:let n = inputdialog("value for shiftwidth", &sw)
3758-
:if n != ""
3759-
: let &sw = n
3760-
:endif
3758+
:let n = inputdialog("value for shiftwidth", shiftwidth())
3759+
:if n != ""
3760+
: let &sw = n
3761+
:endif
37613762
< When the dialog is cancelled {cancelreturn} is returned. When
37623763
omitted an empty string is returned.
37633764
Hitting <Enter> works like pressing the OK button. Hitting
@@ -4635,8 +4636,8 @@ pyeval({expr}) *pyeval()*
46354636
Numbers and strings are returned as they are (strings are
46364637
copied though).
46374638
Lists are represented as Vim |List| type.
4638-
Dictionaries are represented as Vim |Dictionary| type with
4639-
keys converted to strings.
4639+
Dictionaries are represented as Vim |Dictionary| type,
4640+
non-string keys result in error.
46404641
{only available when compiled with the |+python| feature}
46414642

46424643
*E726* *E727*
@@ -5253,8 +5254,9 @@ setreg({regname}, {value} [,{options}])
52535254

52545255
If {options} contains no register settings, then the default
52555256
is to use character mode unless {value} ends in a <NL>.
5256-
Setting the '=' register is not possible.
5257-
Returns zero for success, non-zero for failure.
5257+
Setting the '=' register is not possible, but you can use >
5258+
:let @= = var_expr
5259+
< Returns zero for success, non-zero for failure.
52585260

52595261
Examples: >
52605262
:call setreg(v:register, @*)
@@ -5330,6 +5332,23 @@ shellescape({string} [, {special}]) *shellescape()*
53305332
:call system("chmod +w -- " . shellescape(expand("%")))
53315333
53325334
5335+
shiftwidth() *shiftwidth()*
5336+
Returns the effective value of 'shiftwidth'. This is the
5337+
'shiftwidth' value unless it is zero, in which case it is the
5338+
'tabstop' value. To be backwards compatible in indent
5339+
plugins, use this: >
5340+
if exists('*shiftwidth')
5341+
func s:sw()
5342+
return shiftwidth()
5343+
endfunc
5344+
else
5345+
func s:sw()
5346+
return &sw
5347+
endfunc
5348+
endif
5349+
< And then use s:sw() instead of &sw.
5350+
5351+
53335352
simplify({filename}) *simplify()*
53345353
Simplify the file name as much as possible without changing
53355354
the meaning. Shortcuts (on MS-Windows) or symbolic links (on

0 commit comments

Comments
 (0)