Skip to content

Commit 8cbbb57

Browse files
committed
Updated runtime files.
1 parent 373f36c commit 8cbbb57

Some content is hidden

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

42 files changed

+7420
-6335
lines changed

runtime/autoload/ccomplete.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: C
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2011 Dec 30
4+
" Last Change: 2012 Jun 20
55

66
let s:cpo_save = &cpo
77
set cpo&vim
@@ -500,7 +500,7 @@ function! s:StructMembers(typename, items, all)
500500
endif
501501
if !cached
502502
while 1
503-
exe 'silent! ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
503+
exe 'silent! keepj noautocmd ' . n . 'vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
504504

505505
let qflist = getqflist()
506506
if len(qflist) > 0 || match(typename, "::") < 0

runtime/doc/autocmd.txt

Lines changed: 16 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 Feb 22
1+
*autocmd.txt* For Vim version 7.3. Last change: 2012 Jul 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -385,6 +385,10 @@ BufRead or BufReadPost When starting to edit a new buffer, after
385385
This does NOT work for ":r file". Not used
386386
when the file doesn't exist. Also used after
387387
successfully recovering a file.
388+
Also triggered for the filetypedetect group
389+
when executing ":filetype detect" and when
390+
writing an unnamed buffer in a way that the
391+
buffer gets a name.
388392
*BufReadCmd*
389393
BufReadCmd Before starting to edit a new buffer. Should
390394
read the file into the buffer. |Cmd-event|
@@ -474,6 +478,11 @@ CmdwinLeave Before leaving the command-line window.
474478
*ColorScheme*
475479
ColorScheme After loading a color scheme. |:colorscheme|
476480

481+
*CompleteDone*
482+
CompleteDone After Insert mode completion is done. Either
483+
when something was completed or abandoning
484+
completion. |ins-completion|
485+
477486
*CursorHold*
478487
CursorHold When the user doesn't press a key for the time
479488
specified with 'updatetime'. Not re-triggered
@@ -717,6 +726,12 @@ QuickFixCmdPost Like QuickFixCmdPre, but after a quickfix
717726
it is run after error file is read and before
718727
moving to the first error.
719728
See |QuickFixCmdPost-example|.
729+
*QuitPre*
730+
QuitPre When using `:quit`, before deciding whether it
731+
closes the current window or quits Vim. Can
732+
be used to close any non-essential window if
733+
the current window is the last ordinary
734+
window.
720735
*RemoteReply*
721736
RemoteReply When a reply from a Vim that functions as
722737
server was received |server2client()|. The

runtime/doc/change.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.3. Last change: 2012 Apr 30
1+
*change.txt* For Vim version 7.3. Last change: 2012 Jun 13
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1502,6 +1502,7 @@ n When formatting text, recognize numbered lists. This actually uses
15021502
first line of a paragraph
15031503
second line of the same paragraph
15041504
third line.
1505+
< This also works inside comments, ignoring the comment leader.
15051506
v Vi-compatible auto-wrapping in insert mode: Only break a line at a
15061507
blank that you have entered during the current insert command. (Note:
15071508
this is not 100% Vi compatible. Vi has some "unexpected features" or

runtime/doc/cmdline.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -826,10 +826,11 @@ These modifiers can be given, in this order:
826826
the home directory. If the name is a directory a path
827827
separator is added at the end. For a file name that does not
828828
exist and does not have an absolute path the result is
829-
unpredictable.
829+
unpredictable. On MS-Windows an 8.3 filename is expanded to
830+
the long name.
830831
:8 Converts the path to 8.3 short format (currently only on
831-
win32). Will act on as much of a path that is an existing
832-
path.
832+
MS-Windows). Will act on as much of a path that is an
833+
existing path.
833834
:~ Reduce file name to be relative to the home directory, if
834835
possible. File name is unmodified if it is not below the home
835836
directory.

runtime/doc/editing.txt

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 7.3. Last change: 2012 Apr 03
1+
*editing.txt* For Vim version 7.3. Last change: 2012 Jul 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -377,8 +377,9 @@ command that accepts more than one file name (like ":next file1 file2")
377377
embedded spaces must be escaped with a backslash.
378378

379379
*wildcard* *wildcards*
380-
Wildcards in {file} are expanded. Which wildcards are supported depends on
381-
the system. These are the common ones:
380+
Wildcards in {file} are expanded, but as with file completion, 'wildignore'
381+
and 'suffixes' apply. Which wildcards are supported depends on the system.
382+
These are the common ones:
382383
? matches one character
383384
* matches anything, including nothing
384385
** matches anything, including nothing, recurses into directories
@@ -422,9 +423,11 @@ You can have the backticks expanded as a Vim expression, instead of an
422423
external command, by using the syntax `={expr}` e.g.: >
423424
:e `=tempname()`
424425
The expression can contain just about anything, thus this can also be used to
425-
avoid the special meaning of '"', '|', '%' and '#'. Names are to be separated
426-
with line breaks. When the result is a |List| then each item is used as a
427-
name. Line breaks also separate names.
426+
avoid the special meaning of '"', '|', '%' and '#'. However, 'wildignore'
427+
does apply like to other wildcars.
428+
If the expression returns a string then names are to be separated with line
429+
breaks. When the result is a |List| then each item is used as a name. Line
430+
breaks also separate names.
428431

429432
*++opt* *[++opt]*
430433
The [++opt] argument can be used to force the value of 'fileformat',
@@ -1066,6 +1069,7 @@ The names can be in upper- or lowercase.
10661069
If there are other tab pages and quitting the last
10671070
window in the current tab page the current tab page is
10681071
closed |tab-page|.
1072+
Triggers the |QuitPre| autocommand event.
10691073

10701074
:conf[irm] q[uit] Quit, but give prompt when changes have been made, or
10711075
the last file in the argument list has not been
@@ -1215,21 +1219,21 @@ For versions of Vim where browsing is not supported, the command is executed
12151219
unmodified.
12161220

12171221
*browsefilter*
1218-
For MS Windows, you can modify the filters that are used in the browse dialog.
1219-
By setting the g:browsefilter or b:browsefilter variables, you can change the
1220-
filters globally or locally to the buffer. The variable is set to a string in
1221-
the format "{filter label}\t{pattern};{pattern}\n" where {filter label} is the
1222-
text that appears in the "Files of Type" comboBox, and {pattern} is the
1223-
pattern which filters the filenames. Several patterns can be given, separated
1224-
by ';'.
1222+
For MS Windows and GTK, you can modify the filters that are used in the browse
1223+
dialog. By setting the g:browsefilter or b:browsefilter variables, you can
1224+
change the filters globally or locally to the buffer. The variable is set to
1225+
a string in the format "{filter label}\t{pattern};{pattern}\n" where {filter
1226+
label} is the text that appears in the "Files of Type" comboBox, and {pattern}
1227+
is the pattern which filters the filenames. Several patterns can be given,
1228+
separated by ';'.
12251229

12261230
For Motif the same format is used, but only the very first pattern is actually
12271231
used (Motif only offers one pattern, but you can edit it).
12281232

12291233
For example, to have only Vim files in the dialog, you could use the following
12301234
command: >
12311235
1232-
let g:browsefilter="Vim Scripts\t*.vim\nVim Startup Files\t*vimrc\n"
1236+
let g:browsefilter = "Vim Scripts\t*.vim\nVim Startup Files\t*vimrc\n"
12331237
12341238
You can override the filter setting on a per-buffer basis by setting the
12351239
b:browsefilter variable. You would most likely set b:browsefilter in a
@@ -1239,6 +1243,13 @@ difficult to start editing a file of a different type. To overcome this, you
12391243
may want to add "All Files\t*.*\n" as the final filter, so that the user can
12401244
still access any desired file.
12411245

1246+
To avoid setting browsefilter when Vim does not actually support it, you can
1247+
use has("browsefilter"): >
1248+
1249+
if has("browsefilter")
1250+
let g:browsefilter = "whatever"
1251+
endif
1252+
12421253
==============================================================================
12431254
7. The current directory *current-directory*
12441255

runtime/doc/eval.txt

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2012 May 18
1+
*eval.txt* For Vim version 7.3. Last change: 2012 Jul 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1880,6 +1880,8 @@ pow( {x}, {y}) Float {x} to the power of {y}
18801880
prevnonblank( {lnum}) Number line nr of non-blank line <= {lnum}
18811881
printf( {fmt}, {expr1}...) String format text
18821882
pumvisible() Number whether popup menu is visible
1883+
pyeval( {expr}) any evaluate |Python| expression
1884+
py3eval( {expr}) any evaluate |python3| expression
18831885
range( {expr} [, {max} [, {stride}]])
18841886
List items from {expr} to {max}
18851887
readfile( {fname} [, {binary} [, {max}]])
@@ -3565,6 +3567,9 @@ histadd({history}, {item}) *histadd()*
35653567
"search" or "/" search pattern history
35663568
"expr" or "=" typed expression history
35673569
"input" or "@" input line history
3570+
"debug" or ">" debug command history
3571+
The {history} string does not need to be the whole name, one
3572+
character is sufficient.
35683573
If {item} does already exist in the history, it will be
35693574
shifted to become the newest entry.
35703575
The result is a Number: 1 if the operation was successful,
@@ -4033,7 +4038,7 @@ map({expr}, {string}) *map()*
40334038

40344039
The operation is done in-place. If you want a |List| or
40354040
|Dictionary| to remain unmodified make a copy first: >
4036-
:let tlist = map(copy(mylist), ' & . "\t"')
4041+
:let tlist = map(copy(mylist), ' v:val . "\t"')
40374042
40384043
< Returns {expr}, the |List| or |Dictionary| that was filtered.
40394044
When an error is encountered while evaluating {string} no
@@ -4610,6 +4615,29 @@ pumvisible() *pumvisible()*
46104615
This can be used to avoid some things that would remove the
46114616
popup menu.
46124617

4618+
*E860* *E861*
4619+
py3eval({expr}) *py3eval()*
4620+
Evaluate Python expression {expr} and return its result
4621+
converted to Vim data structures.
4622+
Numbers and strings are returned as they are (strings are
4623+
copied though, unicode strings are additionally converted to
4624+
'encoding').
4625+
Lists are represented as Vim |List| type.
4626+
Dictionaries are represented as Vim |Dictionary| type with
4627+
keys converted to strings.
4628+
{only available when compiled with the |+python3| feature}
4629+
4630+
*E858* *E859*
4631+
pyeval({expr}) *pyeval()*
4632+
Evaluate Python expression {expr} and return its result
4633+
converted to Vim data structures.
4634+
Numbers and strings are returned as they are (strings are
4635+
copied though).
4636+
Lists are represented as Vim |List| type.
4637+
Dictionaries are represented as Vim |Dictionary| type with
4638+
keys converted to strings.
4639+
{only available when compiled with the |+python| feature}
4640+
46134641
*E726* *E727*
46144642
range({expr} [, {max} [, {stride}]]) *range()*
46154643
Returns a |List| with Numbers:
@@ -6219,6 +6247,7 @@ balloon_multiline GUI supports multiline balloons.
62196247
beos BeOS version of Vim.
62206248
browse Compiled with |:browse| support, and browse() will
62216249
work.
6250+
browsefilter Compiled with support for |browsefilter|.
62226251
builtin_terms Compiled with some builtin terminals.
62236252
byte_offset Compiled with support for 'o' in 'statusline'
62246253
cindent Compiled with 'cindent' support.

runtime/doc/if_lua.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_lua.txt* For Vim version 7.3. Last change: 2012 Jan 16
1+
*if_lua.txt* For Vim version 7.3. Last change: 2012 Jun 29
22

33

44
VIM REFERENCE MANUAL by Luis Carvalho
@@ -313,7 +313,7 @@ Examples:
313313
<
314314

315315
==============================================================================
316-
7. The luaeval function *lua-luaeval*
316+
7. The luaeval function *lua-luaeval* *lua-eval*
317317

318318
The (dual) equivalent of "vim.eval" for passing Lua values to Vim is
319319
"luaeval". "luaeval" takes an expression string and an optional argument and

runtime/doc/if_pyth.txt

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
The Python Interface to Vim *python* *Python*
88

9-
1. Commands |python-commands|
10-
2. The vim module |python-vim|
11-
3. Buffer objects |python-buffer|
12-
4. Range objects |python-range|
13-
5. Window objects |python-window|
14-
6. Dynamic loading |python-dynamic|
15-
7. Python 3 |python3|
9+
1. Commands |python-commands|
10+
2. The vim module |python-vim|
11+
3. Buffer objects |python-buffer|
12+
4. Range objects |python-range|
13+
5. Window objects |python-window|
14+
6. pyeval(), py3eval() Vim functions |python-pyeval|
15+
7. Dynamic loading |python-dynamic|
16+
8. Python 3 |python3|
1617

1718
{Vi does not have any of these commands}
1819

@@ -150,6 +151,22 @@ vim.eval(str) *python-eval*
150151
[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
151152
'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]
152153

154+
vim.bindeval(str) *python-bindeval*
155+
Like |python-eval|, but
156+
1. if expression evaluates to |List| or |Dictionary| it is returned as
157+
vimlist or vimdictionary python type that are connected to original
158+
list or dictionary. Thus modifications to these objects imply
159+
modifications of the original.
160+
2. if expression evaluates to a function reference, then it returns
161+
callable vimfunction object. Use self keyword argument to assign
162+
|self| object for dictionary functions.
163+
164+
Note: this function has the same behavior as |lua-eval| (except that
165+
lua does not support running vim functions), |python-eval| is
166+
kept for backwards compatibility in order not to make scripts
167+
relying on outputs of vim.eval() being a copy of original or
168+
vim.eval("1") returning a string.
169+
153170

154171

155172
Error object of the "vim" module
@@ -319,7 +336,13 @@ The height attribute is writable only if the screen is split horizontally.
319336
The width attribute is writable only if the screen is split vertically.
320337

321338
==============================================================================
322-
6. Dynamic loading *python-dynamic*
339+
6. pyeval() and py3eval() Vim functions *python-pyeval*
340+
341+
To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()|
342+
functions to evaluate Python expressions and pass their values to VimL.
343+
344+
==============================================================================
345+
7. Dynamic loading *python-dynamic*
323346

324347
On MS-Windows the Python library can be loaded dynamically. The |:version|
325348
output then includes |+python/dyn|.
@@ -336,13 +359,14 @@ Currently the name is "python24.dll". That is for Python 2.4. To know for
336359
sure edit "gvim.exe" and search for "python\d*.dll\c".
337360

338361
==============================================================================
339-
7. Python 3 *python3*
362+
8. Python 3 *python3*
340363

341364
*:py3* *:python3*
342365
The |:py3| and |:python3| commands work similar to |:python|.
343366
*:py3file*
344367
The |:py3file| command works similar to |:pyfile|.
345368

369+
346370
Vim can be built in four ways (:version output):
347371
1. No Python support (-python, -python3)
348372
2. Python 2 support only (+python or +python/dyn, -python3)

runtime/doc/insert.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*insert.txt* For Vim version 7.3. Last change: 2012 May 18
1+
*insert.txt* For Vim version 7.3. Last change: 2012 Jul 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -491,7 +491,7 @@ option}
491491
*ins-smarttab*
492492
When the 'smarttab' option is on, a <Tab> inserts 'shiftwidth' positions at
493493
the beginning of a line and 'tabstop' positions in other places. This means
494-
that often spaces instead of a <Tab> character are inserted. When 'smarttab
494+
that often spaces instead of a <Tab> character are inserted. When 'smarttab'
495495
is off, a <Tab> always inserts 'tabstop' positions, and 'shiftwidth' is only
496496
used for ">>" and the like. {not in Vi}
497497

@@ -1044,6 +1044,8 @@ that contains the List. The Dict can have these items:
10441044
leading text is changed.
10451045
Other items are ignored.
10461046

1047+
For acting upon end of completion, see the |CompleteDone| autocommand event.
1048+
10471049
For example, the function can contain this: >
10481050
let matches = ... list of words ...
10491051
return {'words': matches, 'refresh': 'always'}

runtime/doc/mbyte.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*mbyte.txt* For Vim version 7.3. Last change: 2012 Feb 29
1+
*mbyte.txt* For Vim version 7.3. Last change: 2012 Jun 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -475,7 +475,7 @@ Useful utilities for converting the charset:
475475
|charset| converter. Supported |charset|: ISO-2022-CN, ISO-2022-JP,
476476
ISO-2022-KR, EUC-CN, EUC-JP, EUC-KR, EUC-TW, UTF-7, UTF-8, ISO-8859
477477
series, Shift_JIS, Big5 and HZ. Lv can be found at:
478-
http://www.ff.iij4u.or.jp/~nrt/freeware/lv4495.tar.gz
478+
http://www.ff.iij4u.or.jp/~nrt/lv/index.html
479479

480480

481481
*mbyte-conversion*
@@ -615,7 +615,7 @@ Each field means:
615615
charsets, such as JIS X 0208, if this field is 0, code points has
616616
the same value as GL, and GR if 1.
617617

618-
For example, in case of a 14 dots font corresponding to JIS X 0208, it is
618+
For example, in case of a 16 dots font corresponding to JIS X 0208, it is
619619
written like:
620620
-misc-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1990-0
621621

0 commit comments

Comments
 (0)