Skip to content

Commit e11dd5a

Browse files
committed
Merge branch 'vim'
2 parents e02ab36 + 72ff631 commit e11dd5a

Some content is hidden

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

75 files changed

+1547
-431
lines changed

.hgtags

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,3 +2588,50 @@ f451d60ab8ec56d02a7b5f2d5c16187566279886 v7-3-1247
25882588
b614332f7df2f6f471bb4bd93767becd7844b90c v7-3-1249
25892589
6aecf486bb347ac6885afe36d62ddbbf2457f898 v7-3-1250
25902590
788f4802967766b7f3d6dce83cc027baef422f4a v7-3-1251
2591+
875a0aeb301c3fb2be8a79f2d82e324d80caf4f3 v7-3-1252
2592+
d6a7dea44a8667d834e463b8658cf85ea938112d v7-3-1253
2593+
5eff37e92f03771aee77a3688d79a73e5b6107e9 v7-3-1254
2594+
f8d307ebd74a4097f7083ea8117be0433f00c7ce v7-3-1255
2595+
322441058afca6a8aa52d34eda9fa307608354d3 v7-3-1256
2596+
5751284311f37399cb7a66d99fe317de4ae86ea9 v7-3-1257
2597+
c9e2ccc53f2e119e247da7fc9111b6b9c9385d93 v7-3-1258
2598+
7ab94cb688bebd694109442be4dd6edb6ebe3c85 v7-3-1259
2599+
7aa4e0822dec0840770d9f41052a772a887cd213 v7-3-1260
2600+
1cf89d38aa7628b55f1a45a5325adc83abe85dc2 v7-3-1261
2601+
5e0b6a9282df8b9435da372cad77482f1f5b20aa v7-3-1262
2602+
a02575cd564ade1019ea89db07c1c1d0c4b5418c v7-3-1263
2603+
558c815e1a38d7ac2fc61c4155aabf8e81a14034 v7-3-1264
2604+
53c1b30632df47993bc00947078dd31a226c9a97 v7-3-1265
2605+
bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb v7-3-1266
2606+
cabdcfe72dc398fd67bbbe02cff5e11e4dc2506e v7-3-1267
2607+
72fcf674e545eb87bb4ea996df56e4eb7c04f6cc v7-3-1268
2608+
350239b0e9eb063d9f84dfa4bc7a2b47d78e9afb v7-3-1269
2609+
35b6fc57a2868b235284d914820da0815e62d54b v7-3-1270
2610+
034abed357a1a2fabe624ed59ea49ebdec09d790 v7-3-1271
2611+
a00cd1839ac4f3467e1e51e619b4c65ce4e0ee81 v7-3-1272
2612+
30910831e5b0f0eb28a8eea7412f5ec9f3533ab2 v7-3-1273
2613+
761cef8f5d1d42e315fb85765ee90857981fec06 v7-3-1274
2614+
8875401008da99a39878478a293f833f68481ffc v7-3-1275
2615+
d2f9f67924e77ec3d90164dd6ff2e50c5107faf0 v7-3-1276
2616+
6a7ae677d6a1f116b685fa0f892052e20003eaad v7-3-1277
2617+
cf52d2a8c05cd037c049abef0f58fd918146f3bb v7-3-1278
2618+
cca600e6092839efeb3795db863916959921bb0e v7-3-1279
2619+
1cacf785299e771ca463c493c8c870e395c09cd0 v7-3-1280
2620+
19ed30f7cef76224ef39ceadefb64387eb986342 v7-3-1281
2621+
22ac43fb6d30ad1097d0c7e8937b28efcb162137 v7-3-1282
2622+
d6ceddc0be86e46a5a9a696e36c54b9d133f2203 v7-3-1283
2623+
7b20dc8041645778eeb2f7823a4c1c647f735d24 v7-3-1284
2624+
14e7a115d54d2c095f31ccda2d04fbcf775dacde v7-3-1285
2625+
6ddc1785c4ff3779c18f5c313da591a052388b2d v7-3-1286
2626+
34c629c3b4bab5fc755e83869d929f8cb322bfcd v7-3-1287
2627+
8b7baf39a345aecf00a6116b5da211b51c6e3457 v7-3-1288
2628+
1ed945570d47e9a60694ed1ef3a5b208243657e9 v7-3-1289
2629+
08d4c11cdaed2c5d95e2c0be3b0df91d01f52b84 v7-3-1290
2630+
a6ddcab6a240d22f965c4961bb93ddfea6a74c73 v7-3-1291
2631+
cad8d29b0bc0356a49a455296e5e79eb6f38139d v7-3-1292
2632+
18b43970fb7a796ab740e65baa4ff2ba46f929a8 v7-3-1293
2633+
11d0c6df1d7bdc399b34a8cc70f354d6ee908661 v7-3-1294
2634+
93cccad6a26b439728bf3c155ed5532001a2f2ab v7-3-1295
2635+
c3a82208e143e4cd4a3b9d9b1716eb9d876bf462 v7-3-1296
2636+
cb0a5c9c0f9bcc6c5a18ed97762206309d3e334c v7-3-1297
2637+
dafd77a15d44cced4e405a9fcfe67fc48a02004a v7-3-1298

runtime/autoload/xmlcomplete.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: XML
33
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
4-
" Last Change: 2006 Aug 15
4+
" Last Change: 2013 Jun 29
55
" Version: 1.9
66
"
77
" Changelog:
@@ -475,12 +475,12 @@ function! s:InCommentAt(line, col)
475475
endfunction
476476

477477
function! s:SetKeywords()
478-
let g:IsKeywordBak=&iskeyword
479-
let &iskeyword='33-255'
478+
let s:IsKeywordBak=&l:iskeyword
479+
let &l:iskeyword='33-255'
480480
endfunction
481481

482482
function! s:RestoreKeywords()
483-
let &iskeyword=g:IsKeywordBak
483+
let &l:iskeyword=s:IsKeywordBak
484484
endfunction
485485

486486
function! s:Push(el, sname)

runtime/compiler/ocaml.vim

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
" Vim Compiler File
2+
" Compiler: ocaml
3+
" Maintainer: See ftplugin/ocaml.vim (?)
4+
" Last Change: June 2013 by Marc Weber
5+
"
6+
" Marc Weber's comments:
7+
" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
8+
" ocamake and whatnot. So which one to use?
9+
"
10+
" This error format was moved from ftplugin/ocaml.vim to this file,
11+
" because ftplugin is the wrong file to set an error format
12+
" and the error format itself is annoying because it joins many lines in this
13+
" error case:
14+
"
15+
" Error: The implementation foo.ml does not match the interface foo.cmi:
16+
" Modules do not match case.
17+
"
18+
" So having it here makes people opt-in
19+
20+
21+
if exists("current_compiler")
22+
finish
23+
endif
24+
let current_compiler = "ocaml"
25+
26+
let s:cpo_save = &cpo
27+
set cpo&vim
28+
29+
CompilerSet errorformat =
30+
\%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
31+
\%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
32+
\%+EReference\ to\ unbound\ regexp\ name\ %m,
33+
\%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
34+
\%Wocamlyacc:\ w\ -\ %m,
35+
\%-Zmake%.%#,
36+
\%C%m,
37+
\%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
38+
\%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
39+
\%D%*\\a:\ Entering\ directory\ `%f',
40+
\%X%*\\a:\ Leaving\ directory\ `%f',
41+
\%DMaking\ %*\\a\ in\ %f
42+
43+
let &cpo = s:cpo_save
44+
unlet s:cpo_save

runtime/doc/if_pyth.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_pyth.txt* For Vim version 7.3. Last change: 2013 Jun 02
1+
*if_pyth.txt* For Vim version 7.3. Last change: 2013 Jun 28
22

33

44
VIM REFERENCE MANUAL by Paul Moore
@@ -740,6 +740,11 @@ To work around such problems there are these options:
740740
3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration. This
741741
may crash Vim though.
742742

743+
*E880*
744+
Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
745+
:py vim.command("qall!")
746+
<
747+
743748
*has-python*
744749
You can test what Python version is available with: >
745750
if has('python')

runtime/doc/map.txt

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 7.3. Last change: 2013 Jun 12
1+
*map.txt* For Vim version 7.3. Last change: 2013 Jun 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -159,24 +159,34 @@ type "a", then "bar" will get inserted.
159159

160160
1.2 SPECIAL ARGUMENTS *:map-arguments*
161161

162-
"<buffer>", "<silent>", "<special>", "<script>", "<expr>" and "<unique>" can
163-
be used in any order. They must appear right after the command, before any
164-
other arguments.
162+
"<buffer>", "<nowait>", "<silent>", "<special>", "<script>", "<expr>" and
163+
"<unique>" can be used in any order. They must appear right after the
164+
command, before any other arguments.
165165

166166
*:map-local* *:map-<buffer>* *E224* *E225*
167167
If the first argument to one of these commands is "<buffer>" the mapping will
168168
be effective in the current buffer only. Example: >
169169
:map <buffer> ,w /[.,;]<CR>
170170
Then you can map ",w" to something else in another buffer: >
171171
:map <buffer> ,w /[#&!]<CR>
172-
The local buffer mappings are used before the global ones.
172+
The local buffer mappings are used before the global ones. See <nowait> below
173+
to make a short local mapping not taking effect when a longer global one
174+
exists.
173175
The "<buffer>" argument can also be used to clear mappings: >
174176
:unmap <buffer> ,w
175177
:mapclear <buffer>
176178
Local mappings are also cleared when a buffer is deleted, but not when it is
177179
unloaded. Just like local option values.
178180
Also see |map-precedence|.
179181

182+
*:map-<nowait>* *:map-nowait*
183+
When defining a buffer-local mapping for "," there may be a global mapping
184+
that starts with ",". Then you need to type another character for Vim to know
185+
whether to use the "," mapping or the longer one. To avoid this add the
186+
<nowait> argument. Then the mapping will be used when it matches, Vim does
187+
not wait for more characters to be typed. However, if the characters were
188+
already type they are used.
189+
180190
*:map-<silent>* *:map-silent*
181191
To define a mapping which will not be echoed on the command line, add
182192
"<silent>" as the first argument. Example: >
@@ -659,13 +669,12 @@ might want to set the 'ttimeout' option.
659669
Buffer-local mappings (defined using |:map-<buffer>|) take precedence over
660670
global mappings. When a buffer-local mapping is the same as a global mapping,
661671
Vim will use the buffer-local mapping. In addition, Vim will use a complete
662-
buffer-local mapping immediately, even if a longer global mapping has the
663-
buffer-local mapping as a prefix. For example, given the following two
664-
mappings: >
665-
:map <buffer> \a :echo "Local \a"<CR>
666-
:map \abc :echo "Global \abc"<CR>
667-
The buffer-local mapping \a will be used immediately. Vim will not wait for
668-
more characters to see if the user might be typing \abc.
672+
mapping immediately if it was defined with <nowait>, even if a longer mapping
673+
has the same prefix. For example, given the following two mappings: >
674+
:map <buffer> <nowait> \a :echo "Local \a"<CR>
675+
:map \abc :echo "Global \abc"<CR>
676+
When typing \a the buffer-local mapping will be used immediately. Vim will
677+
not wait for more characters to see if the user might be typing \abc.
669678

670679
*map-keys-fails*
671680
There are situations where key codes might not be recognized:

runtime/doc/options.txt

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.3. Last change: 2013 Jun 12
1+
*options.txt* For Vim version 7.3. Last change: 2013 Jun 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -482,39 +482,42 @@ to set options automatically for one or more files:
482482
There are two forms of modelines. The first form:
483483
[text]{white}{vi:|vim:|ex:}[white]{options}
484484

485-
[text] any text or empty
486-
{white} at least one blank character (<Space> or <Tab>)
487-
{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:"
488-
[white] optional white space
489-
{options} a list of option settings, separated with white space or ':',
490-
where each part between ':' is the argument for a ":set"
491-
command (can be empty)
485+
[text] any text or empty
486+
{white} at least one blank character (<Space> or <Tab>)
487+
{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:"
488+
[white] optional white space
489+
{options} a list of option settings, separated with white space
490+
or ':', where each part between ':' is the argument
491+
for a ":set" command (can be empty)
492492

493-
Example:
493+
Examples:
494494
vi:noai:sw=3 ts=6 ~
495+
vim: tw=77 ~
495496

496497
The second form (this is compatible with some versions of Vi):
497498

498-
[text]{white}{vi:|vim:|ex:}[white]se[t] {options}:[text]
499+
[text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
499500

500-
[text] any text or empty
501-
{white} at least one blank character (<Space> or <Tab>)
502-
{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:"
503-
[white] optional white space
504-
se[t] the string "set " or "se " (note the space)
505-
{options} a list of options, separated with white space, which is the
506-
argument for a ":set" command
507-
: a colon
508-
[text] any text or empty
501+
[text] any text or empty
502+
{white} at least one blank character (<Space> or <Tab>)
503+
{vi:|vim:|Vim:|ex:} the string "vi:", "vim:", "Vim:" or "ex:"
504+
[white] optional white space
505+
se[t] the string "set " or "se " (note the space); When
506+
"Vim" is used it must be "set".
507+
{options} a list of options, separated with white space, which
508+
is the argument for a ":set" command
509+
: a colon
510+
[text] any text or empty
509511

510-
Example:
512+
Examples:
511513
/* vim: set ai tw=75: */ ~
514+
/* Vim: set ai tw=75: */ ~
512515

513-
The white space before {vi:|vim:|ex:} is required. This minimizes the chance
514-
that a normal word like "lex:" is caught. There is one exception: "vi:" and
515-
"vim:" can also be at the start of the line (for compatibility with version
516-
3.0). Using "ex:" at the start of the line will be ignored (this could be
517-
short for "example:").
516+
The white space before {vi:|vim:|Vim:|ex:} is required. This minimizes the
517+
chance that a normal word like "lex:" is caught. There is one exception:
518+
"vi:" and "vim:" can also be at the start of the line (for compatibility with
519+
version 3.0). Using "ex:" at the start of the line will be ignored (this
520+
could be short for "example:").
518521

519522
*modeline-local*
520523
The options are set like with ":setlocal": The new value only applies to the
@@ -530,7 +533,7 @@ in another window. But window-local options will be set.
530533

531534
*modeline-version*
532535
If the modeline is only to be used for some versions of Vim, the version
533-
number can be specified where "vim:" is used:
536+
number can be specified where "vim:" or "Vim:" is used:
534537
vim{vers}: version {vers} or later
535538
vim<{vers}: version before {vers}
536539
vim={vers}: version {vers}
@@ -6866,7 +6869,8 @@ A jump table for the options with a short description can be found at |Q_op|.
68666869
V N Virtual column number as -{num}. Not displayed if equal to 'c'.
68676870
p N Percentage through file in lines as in |CTRL-G|.
68686871
P S Percentage through file of displayed window. This is like the
6869-
percentage described for 'ruler'. Always 3 in length.
6872+
percentage described for 'ruler'. Always 3 in length, unless
6873+
translated.
68706874
a S Argument list status as in default title. ({current} of {max})
68716875
Empty if the argument file count is zero or one.
68726876
{ NF Evaluate expression between '%{' and '}' and substitute result.

runtime/doc/quickref.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickref.txt* For Vim version 7.3. Last change: 2013 May 20
1+
*quickref.txt* For Vim version 7.3. Last change: 2013 Jun 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -740,10 +740,12 @@ Short explanation of each option: *option-list*
740740
'iconstring' string to use for the Vim icon text
741741
'ignorecase' 'ic' ignore case in search patterns
742742
'imactivatekey' 'imak' key that activates the X input method
743+
'imactivatefunc' 'imaf' function to enable/disable the X input method
743744
'imcmdline' 'imc' use IM when starting to edit a command line
744745
'imdisable' 'imd' do not use the IM in any mode
745746
'iminsert' 'imi' use :lmap or IM in Insert mode
746747
'imsearch' 'ims' use :lmap or IM when typing a search pattern
748+
'imstatusfunc' 'imsf' function to obtain X input method status
747749
'include' 'inc' pattern to be used to find an include file
748750
'includeexpr' 'inex' expression used to process an include line
749751
'incsearch' 'is' highlight match while typing search pattern

runtime/doc/spell.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*spell.txt* For Vim version 7.3. Last change: 2011 May 25
1+
*spell.txt* For Vim version 7.3. Last change: 2013 Jun 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -928,9 +928,13 @@ When the encoding is UTF-8 no word characters need to be specified.
928928
Vim allows you to use spell checking for several languages in the same file.
929929
You can list them in the 'spelllang' option. As a consequence all spell files
930930
for the same encoding must use the same word characters, otherwise they can't
931-
be combined without errors. If you get a warning that the word tables differ
932-
you may need to generate the .spl file again with |:mkspell|. Check the FOL,
933-
LOW and UPP lines in the used .aff file.
931+
be combined without errors.
932+
933+
If you get an E763 warning that the word tables differ you need to update your
934+
".spl" spell files. If you downloaded the files, get the latest version of
935+
all spell files you use. Otherwise generate the .spl file again with
936+
|:mkspell|. If you still get errors check the FOL, LOW and UPP lines in the
937+
used .aff files.
934938

935939
The XX.ascii.spl spell file generated with the "-ascii" argument will not
936940
contain the table with characters, so that it can be combine with spell files

0 commit comments

Comments
 (0)