Skip to content

Commit 7feea41

Browse files
committed
Update runtime files.
1 parent 2738d17 commit 7feea41

36 files changed

+908
-237
lines changed

runtime/autoload/phpcomplete.vim

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: PHP
33
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
4-
" Last Change: 2006 May 9
4+
" Last Change: 2011 Dec 08
55
"
66
" TODO:
77
" - Class aware completion:
@@ -650,6 +650,7 @@ function! phpcomplete#GetClassContents(file, name) " {{{
650650
" this is the most efficient way. The other way
651651
" is to go through the looong string looking for
652652
" matching {}
653+
let original_window = winnr()
653654
below 1new
654655
0put =cfile
655656
call search('class\s\+'.a:name)
@@ -667,6 +668,9 @@ function! phpcomplete#GetClassContents(file, name) " {{{
667668
let classcontent = join(classc, "\n")
668669

669670
bw! %
671+
" go back to where we started
672+
exe original_window.'wincmd w'
673+
670674
if extends_class != ''
671675
let classlocation = phpcomplete#GetClassLocation(extends_class)
672676
if filereadable(classlocation)

runtime/autoload/syntaxcomplete.vim

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
" Vim completion script
22
" Language: All languages, uses existing syntax highlighting rules
33
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
4-
" Version: 7.0
5-
" Last Change: 2010 Jul 29
4+
" Version: 8.0
5+
" Last Change: 2011 Nov 02
66
" Usage: For detailed help, ":help ft-syntax-omni"
77

88
" History
99
"
10+
" Version 8.0
11+
" Updated SyntaxCSyntaxGroupItems()
12+
" - Some additional syntax items were also allowed
13+
" on nextgroup= lines which were ignored by default.
14+
" Now these lines are processed independently.
15+
"
1016
" Version 7.0
1117
" Updated syntaxcomplete#OmniSyntaxList()
1218
" - Looking up the syntax groups defined from a syntax file
@@ -44,7 +50,7 @@ endif
4450
if exists('g:loaded_syntax_completion')
4551
finish
4652
endif
47-
let g:loaded_syntax_completion = 70
53+
let g:loaded_syntax_completion = 80
4854

4955
" Set ignorecase to the ftplugin standard
5056
" This is the default setting, but if you define a buffer local
@@ -72,7 +78,8 @@ endif
7278
" This script will build a completion list based on the syntax
7379
" elements defined by the files in $VIMRUNTIME/syntax.
7480
let s:syn_remove_words = 'match,matchgroup=,contains,'.
75-
\ 'links to,start=,end=,nextgroup='
81+
\ 'links to,start=,end='
82+
" \ 'links to,start=,end=,nextgroup='
7683

7784
let s:cache_name = []
7885
let s:cache_list = []
@@ -411,9 +418,25 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
411418
\ , "\n", 'g'
412419
\ )
413420

414-
" Now strip off the newline + blank space + contained
421+
" Now strip off the newline + blank space + contained.
422+
" Also include lines with nextgroup=@someName skip_key_words syntax_element
423+
let syn_list = substitute(
424+
\ syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\|nextgroup=\)'
425+
\ , "", 'g'
426+
\ )
427+
428+
" This can leave lines like this
429+
" =@vimMenuList skipwhite onoremenu
430+
" Strip the special option keywords first
431+
" :h :syn-skipwhite*
432+
let syn_list = substitute(
433+
\ syn_list, '\<\(skipwhite\|skipnl\|skipempty\)\>'
434+
\ , "", 'g'
435+
\ )
436+
437+
" Now remove the remainder of the nextgroup=@someName lines
415438
let syn_list = substitute(
416-
\ syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\)'
439+
\ syn_list, '\%(^\|\n\)\@<=\s*\(@\w\+\)'
417440
\ , "", 'g'
418441
\ )
419442

runtime/doc/autocmd.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.3. Last change: 2011 Aug 29
1+
*autocmd.txt* For Vim version 7.3. Last change: 2011 Oct 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1061,8 +1061,8 @@ option will not cause any commands to be executed.
10611061
It's possible to use this inside an autocommand too,
10621062
so you can base the autocommands for one extension on
10631063
another extension. Example: >
1064-
:au Bufenter *.cpp so ~/.vimrc_cpp
1065-
:au Bufenter *.cpp doau BufEnter x.c
1064+
:au BufEnter *.cpp so ~/.vimrc_cpp
1065+
:au BufEnter *.cpp doau BufEnter x.c
10661066
< Be careful to avoid endless loops. See
10671067
|autocmd-nested|.
10681068

runtime/doc/change.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -71,7 +71,7 @@ For inserting text see |insert.txt|.
7171
"D" deletes the highlighted text plus all text until
7272
the end of the line. {not in Vi}
7373

74-
*:d* *:de* *:del* *:delete*
74+
*:d* *:de* *:del* *:delete* *:dl*
7575
:[range]d[elete] [x] Delete [range] lines (default: current line) [into
7676
register x].
7777

runtime/doc/eval.txt

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2011 Sep 30
1+
*eval.txt* For Vim version 7.3. Last change: 2011 Dec 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -615,7 +615,6 @@ Expression syntax summary, from least to most significant:
615615
- expr7 unary minus
616616
+ expr7 unary plus
617617

618-
619618
|expr8| expr8[expr1] byte of a String or item of a |List|
620619
expr8[expr1 : expr1] substring of a String or sublist of a |List|
621620
expr8.name entry in a |Dictionary|
@@ -946,7 +945,8 @@ When expr8 is a |Funcref| type variable, invoke the function it refers to.
946945
*expr9*
947946
number
948947
------
949-
number number constant *expr-number*
948+
number number constant *expr-number*
949+
*hex-number* *octal-number*
950950

951951
Decimal, Hexadecimal (starting with 0x or 0X), or Octal (starting with 0).
952952

@@ -1768,7 +1768,7 @@ foldtext( ) String line displayed for closed fold
17681768
foldtextresult( {lnum}) String text for closed fold at {lnum}
17691769
foreground( ) Number bring the Vim window to the foreground
17701770
function( {name}) Funcref reference to function {name}
1771-
garbagecollect( [at_exit]) none free memory, breaking cyclic references
1771+
garbagecollect( [{atexit}]) none free memory, breaking cyclic references
17721772
get( {list}, {idx} [, {def}]) any get item {idx} from {list} or {def}
17731773
get( {dict}, {key} [, {def}]) any get item {key} from {dict} or {def}
17741774
getbufline( {expr}, {lnum} [, {end}])
@@ -1844,7 +1844,8 @@ log( {expr}) Float natural logarithm (base e) of {expr}
18441844
log10( {expr}) Float logarithm of Float {expr} to base 10
18451845
map( {expr}, {string}) List/Dict change each item in {expr} to {expr}
18461846
maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
1847-
String rhs of mapping {name} in mode {mode}
1847+
String or Dict
1848+
rhs of mapping {name} in mode {mode}
18481849
mapcheck( {name}[, {mode} [, {abbr}]])
18491850
String check for mappings matching {name}
18501851
match( {expr}, {pat}[, {start}[, {count}]])
@@ -3077,7 +3078,7 @@ function({name}) *function()* *E700*
30773078
{name} can be a user defined function or an internal function.
30783079

30793080

3080-
garbagecollect([at_exit]) *garbagecollect()*
3081+
garbagecollect([{atexit}]) *garbagecollect()*
30813082
Cleanup unused |Lists| and |Dictionaries| that have circular
30823083
references. There is hardly ever a need to invoke this
30833084
function, as it is automatically done when Vim runs out of
@@ -3087,7 +3088,7 @@ garbagecollect([at_exit]) *garbagecollect()*
30873088
This is useful if you have deleted a very big |List| and/or
30883089
|Dictionary| with circular references in a script that runs
30893090
for a long time.
3090-
When the optional "at_exit" argument is one, garbage
3091+
When the optional {atexit} argument is one, garbage
30913092
collection will also be done when exiting Vim, if it wasn't
30923093
done before. This is useful when checking for memory leaks.
30933094

@@ -3163,6 +3164,8 @@ getchar([expr]) *getchar()*
31633164
one-byte character it is the character itself as a number.
31643165
Use nr2char() to convert it to a String.
31653166

3167+
Use getcharmod() to obtain any additional modifiers.
3168+
31663169
When the user clicks a mouse button, the mouse event will be
31673170
returned. The position can then be found in |v:mouse_col|,
31683171
|v:mouse_lnum| and |v:mouse_win|. This example positions the
@@ -3201,10 +3204,11 @@ getcharmod() *getcharmod()*
32013204
2 shift
32023205
4 control
32033206
8 alt (meta)
3204-
16 mouse double click
3205-
32 mouse triple click
3206-
64 mouse quadruple click
3207-
128 Macintosh only: command
3207+
16 meta (when it's different from ALT)
3208+
32 mouse double click
3209+
64 mouse triple click
3210+
96 mouse quadruple click (== 32 + 64)
3211+
128 command (Macintosh only)
32083212
Only the modifiers that have not been included in the
32093213
character itself are obtained. Thus Shift-a results in "A"
32103214
without a modifier.
@@ -6258,6 +6262,7 @@ mouse_gpm Compiled with support for gpm (Linux console mouse)
62586262
mouse_netterm Compiled with support for netterm mouse.
62596263
mouse_pterm Compiled with support for qnx pterm mouse.
62606264
mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse)
6265+
mouse_urxvt Compiled with support for urxvt mouse.
62616266
mouse_xterm Compiled with support for xterm mouse.
62626267
mouseshape Compiled with support for 'mouseshape'.
62636268
multi_byte Compiled with support for 'encoding'

runtime/doc/map.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -246,8 +246,8 @@ have these mappings: >
246246
inoremap <expr> <C-L>x "foo"
247247
If you now type CTRL-L nothing happens yet, Vim needs the next character to
248248
decide what mapping to use. If you type 'x' the second mapping is used and
249-
"foo" is inserted. If you type 'a' the first mapping is used, getchar() gets
250-
the 'a' and returns it.
249+
"foo" is inserted. If you type any other key the first mapping is used,
250+
getchar() gets the typed key and returns it.
251251

252252
Here is an example that inserts a list number that increases: >
253253
let counter = 0

runtime/doc/options.txt

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.3. Last change: 2011 Sep 30
1+
*options.txt* For Vim version 7.3. Last change: 2011 Dec 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -401,6 +401,9 @@ On Unix systems the form "${HOME}" can be used too. The name between {} can
401401
contain non-id characters then. Note that if you want to use this for the
402402
"gf" command, you need to add the '{' and '}' characters to 'isfname'.
403403

404+
On MS-Windows, if $HOME is not defined as an environment variable, then
405+
at runtime Vim will set it to the expansion of $HOMEDRIVE$HOMEPATH.
406+
404407
NOTE: expanding environment variables and "~/" is only done with the ":set"
405408
command, not when assigning a value to an option with ":let".
406409

@@ -1217,7 +1220,8 @@ A jump table for the options with a short description can be found at |Q_op|.
12171220
|:bwipeout|
12181221

12191222
CAREFUL: when "unload", "delete" or "wipe" is used changes in a buffer
1220-
are lost without a warning.
1223+
are lost without a warning. Also, these values may break autocommands
1224+
that switch between buffers temporarily.
12211225
This option is used together with 'buftype' and 'swapfile' to specify
12221226
special kinds of buffers. See |special-buffers|.
12231227

@@ -3554,8 +3558,8 @@ A jump table for the options with a short description can be found at |Q_op|.
35543558
screen.
35553559

35563560
*'guioptions'* *'go'*
3557-
'guioptions' 'go' string (default "gmrLtT" (MS-Windows),
3558-
"agimrLtT" (GTK, Motif and Athena))
3561+
'guioptions' 'go' string (default "egmrLtT" (MS-Windows),
3562+
"aegimrLtT" (GTK, Motif and Athena))
35593563
global
35603564
{not in Vi}
35613565
{only available when compiled with GUI enabled}
@@ -3858,14 +3862,16 @@ A jump table for the options with a short description can be found at |Q_op|.
38583862
are not applied.
38593863
See also: 'incsearch' and |:match|.
38603864
When you get bored looking at the highlighted matches, you can turn it
3861-
off with |:nohlsearch|. As soon as you use a search command, the
3862-
highlighting comes back.
3865+
off with |:nohlsearch|. This does not change the option value, as
3866+
soon as you use a search command, the highlighting comes back.
38633867
'redrawtime' specifies the maximum time spent on finding matches.
38643868
When the search pattern can match an end-of-line, Vim will try to
38653869
highlight all of the matched text. However, this depends on where the
38663870
search starts. This will be the first line in the window or the first
38673871
line below a closed fold. A match in a previous line which is not
38683872
drawn may not continue in a newly drawn line.
3873+
You can specify whether the highlight status is restored on startup
3874+
with the 'h' flag in 'viminfo' |viminfo-h|.
38693875
NOTE: This option is reset when 'compatible' is set.
38703876

38713877
*'history'* *'hi'*
@@ -5241,7 +5247,7 @@ A jump table for the options with a short description can be found at |Q_op|.
52415247
recognized as a compressed file.
52425248
Only normal file name characters can be used, "/\*?[|<>" are illegal.
52435249

5244-
*'path'* *'pa'* *E343* *E345* *E347*
5250+
*'path'* *'pa'* *E343* *E345* *E347* *E854*
52455251
'path' 'pa' string (default on Unix: ".,/usr/include,,"
52465252
on OS/2: ".,/emx/include,,"
52475253
other systems: ".,,")
@@ -7368,6 +7374,8 @@ A jump table for the options with a short description can be found at |Q_op|.
73687374
jsbterm JSB term mouse handling.
73697375
*pterm-mouse*
73707376
pterm QNX pterm mouse handling.
7377+
*urxvt-mouse*
7378+
urxvt Mouse handling for the urxvt (rxvt-unicode) terminal.
73717379

73727380
The mouse handling must be enabled at compile time |+mouse_xterm|
73737381
|+mouse_dec| |+mouse_netterm|.
@@ -7584,15 +7592,18 @@ A jump table for the options with a short description can be found at |Q_op|.
75847592
parameter. The following is a list of the identifying characters and
75857593
the effect of their value.
75867594
CHAR VALUE ~
7595+
*viminfo-!*
75877596
! When included, save and restore global variables that start
75887597
with an uppercase letter, and don't contain a lowercase
75897598
letter. Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
75907599
and "_K_L_M" are not. Nested List and Dict items may not be
75917600
read back correctly, you end up with an empty item.
7601+
*viminfo-quote*
75927602
" Maximum number of lines saved for each register. Old name of
75937603
the '<' item, with the disadvantage that you need to put a
75947604
backslash before the ", otherwise it will be recognized as the
75957605
start of a comment!
7606+
*viminfo-%*
75967607
% When included, save and restore the buffer list. If Vim is
75977608
started with a file name argument, the buffer list is not
75987609
restored. If Vim is started without a file name argument, the
@@ -7602,38 +7613,48 @@ A jump table for the options with a short description can be found at |Q_op|.
76027613
When followed by a number, the number specifies the maximum
76037614
number of buffers that are stored. Without a number all
76047615
buffers are stored.
7616+
*viminfo-'*
76057617
' Maximum number of previously edited files for which the marks
76067618
are remembered. This parameter must always be included when
76077619
'viminfo' is non-empty.
76087620
Including this item also means that the |jumplist| and the
76097621
|changelist| are stored in the viminfo file.
7622+
*viminfo-/*
76107623
/ Maximum number of items in the search pattern history to be
76117624
saved. If non-zero, then the previous search and substitute
76127625
patterns are also saved. When not included, the value of
76137626
'history' is used.
7627+
*viminfo-:*
76147628
: Maximum number of items in the command-line history to be
76157629
saved. When not included, the value of 'history' is used.
7630+
*viminfo-<*
76167631
< Maximum number of lines saved for each register. If zero then
76177632
registers are not saved. When not included, all lines are
76187633
saved. '"' is the old name for this item.
76197634
Also see the 's' item below: limit specified in Kbyte.
7635+
*viminfo-@*
76207636
@ Maximum number of items in the input-line history to be
76217637
saved. When not included, the value of 'history' is used.
7638+
*viminfo-c*
76227639
c When included, convert the text in the viminfo file from the
76237640
'encoding' used when writing the file to the current
76247641
'encoding'. See |viminfo-encoding|.
7642+
*viminfo-f*
76257643
f Whether file marks need to be stored. If zero, file marks ('0
76267644
to '9, 'A to 'Z) are not stored. When not present or when
76277645
non-zero, they are all stored. '0 is used for the current
76287646
cursor position (when exiting or when doing ":wviminfo").
7647+
*viminfo-h*
76297648
h Disable the effect of 'hlsearch' when loading the viminfo
76307649
file. When not included, it depends on whether ":nohlsearch"
76317650
has been used since the last search command.
7651+
*viminfo-n*
76327652
n Name of the viminfo file. The name must immediately follow
76337653
the 'n'. Must be the last one! If the "-i" argument was
76347654
given when starting Vim, that file name overrides the one
76357655
given here with 'viminfo'. Environment variables are expanded
76367656
when opening the file, not when setting the option.
7657+
*viminfo-r*
76377658
r Removable media. The argument is a string (up to the next
76387659
','). This parameter can be given several times. Each
76397660
specifies the start of a path for which no marks will be
@@ -7642,6 +7663,7 @@ A jump table for the options with a short description can be found at |Q_op|.
76427663
also use it for temp files, e.g., for Unix: "r/tmp". Case is
76437664
ignored. Maximum length of each 'r' argument is 50
76447665
characters.
7666+
*viminfo-s*
76457667
s Maximum size of an item in Kbyte. If zero then registers are
76467668
not saved. Currently only applies to registers. The default
76477669
"s10" will exclude registers with more than 10 Kbyte of text.

0 commit comments

Comments
 (0)