Skip to content

Commit 5428a4b

Browse files
committed
Merge branch 'vim'
Conflicts: src/auto/configure
2 parents 6bb23c8 + fed59ac commit 5428a4b

Some content is hidden

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

106 files changed

+12918
-18810
lines changed

.hgtags

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2775,3 +2775,54 @@ c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7-4-047
27752775
eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7-4-050
27762776
e7a2f217a385e6aebfddc4d29182924ac017d262 v7-4-051
27772777
b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7-4-052
2778+
733193bf24c3a80883c60964922c7cdc83662eb2 v7-4-053
2779+
7b760cda2bbf086ba975fd5a4bdc6190a0f08caf v7-4-054
2780+
38a755adc58063894c6695d702cc37f4910bad14 v7-4-055
2781+
8d83c219fc7b2ec8685ab9e0dd7d3067b7f9d1e9 v7-4-056
2782+
3109053ce4e3d17ca6ecab06c0ea0f38581d2f41 v7-4-057
2783+
fa8447ec582378ca8d2c0245bd4ac195876abf2b v7-4-058
2784+
2a72805a3038285c35f47dc0327a57cdabbdf09d v7-4-059
2785+
46ca8fcee5257cc036ac928d91b2a490cf47a956 v7-4-060
2786+
739074bdceb85d16b9e70791d91a59c2b846ed8d v7-4-061
2787+
d59a0b8e5584c6e093990abb1b1e640aff7620bd v7-4-062
2788+
9cedb4dfd4c830783ac65128dbbb118da2e3c638 v7-4-063
2789+
d062239654688774d38e60ac42cec8ae1fd0f14b v7-4-064
2790+
7f341db39d5bee0a9259a14a65e19bc9efa65417 v7-4-065
2791+
38b948f534e4646bf879cb4d30151474e093d139 v7-4-066
2792+
86bf09a1b6d0275131caf7ffc51598608e7242de v7-4-067
2793+
efa40be729c2c94c1d8d0bf95000c4a7d2976dbc v7-4-068
2794+
878ed73c70706d68bc7175343e4deb24b11963c2 v7-4-069
2795+
e6f3f66028d448bb49ee2336cee60b13ced7cea9 v7-4-070
2796+
faf7e86203b5d5c98bdd30dd92524e5062b2412a v7-4-071
2797+
d563839a9be0be6e85d93e366b4f7ffe705d8e3b v7-4-072
2798+
d0595545e98a3b7b6fe1a96ab0106d8afd63c31e v7-4-073
2799+
9818311eeca0d76641879e95143f314e7295cc26 v7-4-074
2800+
829aa8c8449d85d0de3a29ac8ce647ec706efd02 v7-4-075
2801+
8f0c264db1e76a65499f0846d961907d7ecade9e v7-4-076
2802+
53bc55e58fefee7a83a7a56fc7f05e0a4d36dd47 v7-4-077
2803+
5c3064feddd7c9bfef18d8067172335f101122c5 v7-4-078
2804+
6ae816249627b34aee618b49c4169b7ca1f54ff3 v7-4-079
2805+
c5166fa1046462d73891f0b395d6619e7ce96c82 v7-4-080
2806+
42927712b3d997bdba9d8ff5a1199fe4652c5899 v7-4-081
2807+
9c777e2c702487bd0b5c48a22edc17c98b87e070 v7-4-082
2808+
6367a766027d3b60caff43c35d8d3597ad90f6c6 v7-4-083
2809+
a56f60cf683455bea96daf077458158041e4d6ba v7-4-084
2810+
70c3289803b3129f34ffc327b113dcf152222a56 v7-4-085
2811+
60a5b7b82016da631dd7acc6121913d02c5677f8 v7-4-086
2812+
9334c994be7bb5e16a1f9c6b67e1c4342a6a386c v7-4-087
2813+
853a76c7fdedefbc1dfdc2a4896d37a3806500e2 v7-4-088
2814+
6707c44cec61d76026d5dcdd6573fb41cb89d0bd v7-4-089
2815+
31217cc48e7d8c9aca703688d3d04d8edbc85bba v7-4-090
2816+
9502d1caf90bf56f0125c99b7d17ba70944ebd85 v7-4-091
2817+
1b4cb2c6b285265da4ffbe242af35a73e1b118e6 v7-4-092
2818+
33f3e277ceab43179c74093f68196bd370199dbc v7-4-093
2819+
68b5f8abca93dd035ba180aa673a5bbf035b89db v7-4-094
2820+
acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7-4-095
2821+
645358801356c7b1c53a1d3b1543781a669a7733 v7-4-096
2822+
93c8296281dd64e513d52db9f745965926df5cab v7-4-097
2823+
79a8bac614c0c565617b404764f28675687ad442 v7-4-098
2824+
8451f643a13eaf22e35a45e6bdd47c8d5b24c222 v7-4-099
2825+
5ad60cd88339c6217fbea8cf4f92dae04ac1c71d v7-4-100
2826+
ec5d11403c1952b2ed192f28afb6261d0867bb20 v7-4-101
2827+
9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7-4-102
2828+
4db151014f93b7512919e452e6b3f4184758db7b v7-4-103

runtime/doc/change.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.4. Last change: 2013 Aug 25
1+
*change.txt* For Vim version 7.4. Last change: 2013 Nov 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -475,8 +475,8 @@ If the 'shiftround' option is on, the indent is rounded to a multiple of
475475
'shiftwidth'.
476476

477477
If the 'smartindent' option is on, or 'cindent' is on and 'cinkeys' contains
478-
'#', shift right does not affect lines starting with '#' (these are supposed
479-
to be C preprocessor lines that must stay in column 1).
478+
'#' with a zero value, shift right does not affect lines starting with '#'
479+
(these are supposed to be C preprocessor lines that must stay in column 1).
480480

481481
When the 'expandtab' option is off (this is the default) Vim uses <Tab>s as
482482
much as possible to make the indent. You can use ">><<" to replace an indent

runtime/doc/cmdline.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ terminals)
356356
List the recent five entries from all histories: >
357357
:history all -5,
358358
359+
:keepp[atterns] {command} *:keepp* *:keeppatterns*
360+
Execute {command}, without adding anything to the search
361+
history
362+
359363
==============================================================================
360364
2. Command-line completion *cmdline-completion*
361365

runtime/doc/eval.txt

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2013 Aug 24
1+
*eval.txt* For Vim version 7.4. Last change: 2013 Nov 08
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1455,6 +1455,13 @@ v:foldend Used for 'foldtext': last line of closed fold.
14551455
v:foldstart Used for 'foldtext': first line of closed fold.
14561456
Read-only in the |sandbox|. |fold-foldtext|
14571457

1458+
*v:hlsearch* *hlsearch-variable*
1459+
v:hlsearch Variable that determines whether search highlighting is on.
1460+
Makes sense only if 'hlsearch' is enabled which requires
1461+
|+extra_search|. Setting this variable to zero acts the like
1462+
|:nohlsearch| command, setting it to one acts like >
1463+
let &hlsearch = &hlsearch
1464+
<
14581465
*v:insertmode* *insertmode-variable*
14591466
v:insertmode Used for the |InsertEnter| and |InsertChange| autocommand
14601467
events. Values:
@@ -1713,6 +1720,7 @@ bufnr( {expr}) Number Number of the buffer {expr}
17131720
bufwinnr( {expr}) Number window number of buffer {expr}
17141721
byte2line( {byte}) Number line number at byte count {byte}
17151722
byteidx( {expr}, {nr}) Number byte index of {nr}'th char in {expr}
1723+
byteidxcomp( {expr}, {nr}) Number byte index of {nr}'th char in {expr}
17161724
call( {func}, {arglist} [, {dict}])
17171725
any call {func} with arguments {arglist}
17181726
ceil( {expr}) Float round {expr} up
@@ -2261,7 +2269,10 @@ byteidx({expr}, {nr}) *byteidx()*
22612269
{expr}. Use zero for the first character, it returns zero.
22622270
This function is only useful when there are multibyte
22632271
characters, otherwise the returned value is equal to {nr}.
2264-
Composing characters are counted as a separate character.
2272+
Composing characters are not counted separately, their byte
2273+
length is added to the preceding base character. See
2274+
|byteidxcomp()| below for counting composing characters
2275+
separately.
22652276
Example : >
22662277
echo matchstr(str, ".", byteidx(str, 3))
22672278
< will display the fourth character. Another way to do the
@@ -2270,7 +2281,20 @@ byteidx({expr}, {nr}) *byteidx()*
22702281
echo strpart(s, 0, byteidx(s, 1))
22712282
< If there are less than {nr} characters -1 is returned.
22722283
If there are exactly {nr} characters the length of the string
2273-
is returned.
2284+
in bytes is returned.
2285+
2286+
byteidxcomp({expr}, {nr}) *byteidxcomp()*
2287+
Like byteidx(), except that a composing character is counted
2288+
as a separate character. Example: >
2289+
let s = 'e' . nr2char(0x301)
2290+
echo byteidx(s, 1)
2291+
echo byteidxcomp(s, 1)
2292+
echo byteidxcomp(s, 2)
2293+
< The first and third echo result in 3 ('e' plus composing
2294+
character is 3 bytes), the second echo results in 1 ('e' is
2295+
one byte).
2296+
Only works different from byteidx() when 'encoding' is set to
2297+
a Unicode encoding.
22742298

22752299
call({func}, {arglist} [, {dict}]) *call()* *E699*
22762300
Call function {func} with the items in |List| {arglist} as
@@ -4211,6 +4235,9 @@ matchadd({group}, {pattern}[, {priority}[, {id}]])
42114235
"match"). It will be highlighted with {group}. Returns an
42124236
identification number (ID), which can be used to delete the
42134237
match using |matchdelete()|.
4238+
Matching is case sensitive and magic, unless case sensitivity
4239+
or magicness are explicitly overridden in {pattern}. The
4240+
'magic', 'smartcase' and 'ignorecase' options are not used.
42144241

42154242
The optional {priority} argument assigns a priority to the
42164243
match. A match with a high priority will have its

runtime/doc/indent.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim version 7.4. Last change: 2013 Aug 03
1+
*indent.txt* For Vim version 7.4. Last change: 2013 Nov 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -545,18 +545,20 @@ The examples below assume a 'shiftwidth' of 4.
545545
(default 70 lines).
546546

547547
*cino-#*
548-
#N When N is non-zero recognize shell/Perl comments, starting with
549-
'#'. Default N is zero: don't recognize '#' comments. Note
550-
that lines starting with # will still be seen as preprocessor
551-
lines.
548+
#N When N is non-zero recognize shell/Perl comments starting with
549+
'#', do not recognize preprocessor lines; allow right-shifting
550+
lines that start with "#".
551+
When N is zero (default): don't recognize '#' comments, do
552+
recognize preprocessor lines; right-shifting lines that start
553+
with "#" does not work.
552554

553555

554556
The defaults, spelled out in full, are:
555557
cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
556558
c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0
557559

558560
Vim puts a line in column 1 if:
559-
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
561+
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#0'.
560562
- It starts with a label (a keyword followed by ':', other than "case" and
561563
"default") and 'cinoptions' does not contain an 'L' entry with a positive
562564
value.

runtime/doc/index.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 7.4. Last change: 2013 Oct 01
1+
*index.txt* For Vim version 7.4. Last change: 2013 Nov 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1275,6 +1275,7 @@ tag command action ~
12751275
|:keepalt| :keepa[lt] following command keeps the alternate file
12761276
|:keepmarks| :kee[pmarks] following command keeps marks where they are
12771277
|:keepjumps| :keepj[umps] following command keeps jumplist and marks
1278+
|:keeppatterns| :keepp[atterns] following command keeps search pattern history
12781279
|:lNext| :lN[ext] go to previous entry in location list
12791280
|:lNfile| :lNf[ile] go to last entry in previous file
12801281
|:list| :l[ist] print lines

runtime/doc/options.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2013 Aug 22
1+
*options.txt* For Vim version 7.4. Last change: 2013 Nov 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6670,6 +6670,9 @@ A jump table for the options with a short description can be found at |Q_op|.
66706670
region by listing them: "en_us,en_ca" supports both US and Canadian
66716671
English, but not words specific for Australia, New Zealand or Great
66726672
Britain.
6673+
If the name "cjk" is included East Asian characters are excluded from
6674+
spell checking. This is useful when editing text that also has Asian
6675+
words.
66736676
*E757*
66746677
As a special case the name of a .spl file can be given as-is. The
66756678
first "_xx" in the name is removed and used as the region name
@@ -7721,7 +7724,7 @@ A jump table for the options with a short description can be found at |Q_op|.
77217724
*'undolevels'* *'ul'*
77227725
'undolevels' 'ul' number (default 100, 1000 for Unix, VMS,
77237726
Win32 and OS/2)
7724-
global
7727+
global or local to buffer |global-local|
77257728
{not in Vi}
77267729
Maximum number of changes that can be undone. Since undo information
77277730
is kept in memory, higher numbers will cause more memory to be used
@@ -7732,8 +7735,9 @@ A jump table for the options with a short description can be found at |Q_op|.
77327735
< But you can also get Vi compatibility by including the 'u' flag in
77337736
'cpoptions', and still be able to use CTRL-R to repeat undo.
77347737
Also see |undo-two-ways|.
7735-
Set to a negative number for no undo at all: >
7736-
set ul=-1
7738+
Set to -1 for no undo at all. You might want to do this only for the
7739+
current buffer: >
7740+
setlocal ul=-1
77377741
< This helps when you run out of memory for a single change.
77387742
Also see |clear-undo|.
77397743

runtime/doc/pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 7.4. Last change: 2013 Jul 06
1+
*pattern.txt* For Vim version 7.4. Last change: 2013 Nov 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/spell.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*spell.txt* For Vim version 7.4. Last change: 2013 Jul 17
1+
*spell.txt* For Vim version 7.4. Last change: 2013 Nov 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -269,6 +269,13 @@ In a table:
269269
latin1 yi transliterated Yiddish
270270
utf-8 yi-tr transliterated Yiddish
271271

272+
*spell-cjk*
273+
Chinese, Japanese and other East Asian characters are normally marked as
274+
errors, because spell checking of these characters is not supported. If
275+
'spelllang' includes "cjk", these characters are not marked as errors. This
276+
is useful when editing text with spell checking while some Asian words are
277+
present.
278+
272279

273280
SPELL FILES *spell-load*
274281

runtime/doc/tags

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,6 +2317,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
23172317
:keepj motion.txt /*:keepj*
23182318
:keepjumps motion.txt /*:keepjumps*
23192319
:keepmarks motion.txt /*:keepmarks*
2320+
:keepp cmdline.txt /*:keepp*
2321+
:keeppatterns cmdline.txt /*:keeppatterns*
23202322
:l various.txt /*:l*
23212323
:lN quickfix.txt /*:lN*
23222324
:lNext quickfix.txt /*:lNext*
@@ -4952,6 +4954,7 @@ builtin_terms term.txt /*builtin_terms*
49524954
byte-count editing.txt /*byte-count*
49534955
byte2line() eval.txt /*byte2line()*
49544956
byteidx() eval.txt /*byteidx()*
4957+
byteidxcomp() eval.txt /*byteidxcomp()*
49554958
bzip2 pi_gzip.txt /*bzip2*
49564959
c change.txt /*c*
49574960
c.vim syntax.txt /*c.vim*
@@ -6416,6 +6419,7 @@ hl-WarningMsg syntax.txt /*hl-WarningMsg*
64166419
hl-WildMenu syntax.txt /*hl-WildMenu*
64176420
hlID() eval.txt /*hlID()*
64186421
hlexists() eval.txt /*hlexists()*
6422+
hlsearch-variable eval.txt /*hlsearch-variable*
64196423
holy-grail index.txt /*holy-grail*
64206424
home intro.txt /*home*
64216425
home-replace editing.txt /*home-replace*
@@ -7880,6 +7884,7 @@ spell-affix-flags spell.txt /*spell-affix-flags*
78807884
spell-affix-mbyte spell.txt /*spell-affix-mbyte*
78817885
spell-affix-not-supported spell.txt /*spell-affix-not-supported*
78827886
spell-affix-vim spell.txt /*spell-affix-vim*
7887+
spell-cjk spell.txt /*spell-cjk*
78837888
spell-compound spell.txt /*spell-compound*
78847889
spell-dic-format spell.txt /*spell-dic-format*
78857890
spell-double-scoring spell.txt /*spell-double-scoring*
@@ -8457,6 +8462,7 @@ v:folddashes eval.txt /*v:folddashes*
84578462
v:foldend eval.txt /*v:foldend*
84588463
v:foldlevel eval.txt /*v:foldlevel*
84598464
v:foldstart eval.txt /*v:foldstart*
8465+
v:hlsearch eval.txt /*v:hlsearch*
84608466
v:insertmode eval.txt /*v:insertmode*
84618467
v:key eval.txt /*v:key*
84628468
v:lang eval.txt /*v:lang*

0 commit comments

Comments
 (0)