Permalink
Browse files

Update runtime files.

  • Loading branch information...
1 parent 2738d17 commit 7feea4182ea6bb702852f04e3772ff03c2e6297a @brammool brammool committed Dec 14, 2011
@@ -1,7 +1,7 @@
" Vim completion script
" Language: PHP
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2006 May 9
+" Last Change: 2011 Dec 08
"
" TODO:
" - Class aware completion:
@@ -650,6 +650,7 @@ function! phpcomplete#GetClassContents(file, name) " {{{
" this is the most efficient way. The other way
" is to go through the looong string looking for
" matching {}
+ let original_window = winnr()
below 1new
0put =cfile
call search('class\s\+'.a:name)
@@ -667,6 +668,9 @@ function! phpcomplete#GetClassContents(file, name) " {{{
let classcontent = join(classc, "\n")
bw! %
+ " go back to where we started
+ exe original_window.'wincmd w'
+
if extends_class != ''
let classlocation = phpcomplete#GetClassLocation(extends_class)
if filereadable(classlocation)
@@ -1,12 +1,18 @@
" Vim completion script
" Language: All languages, uses existing syntax highlighting rules
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
-" Version: 7.0
-" Last Change: 2010 Jul 29
+" Version: 8.0
+" Last Change: 2011 Nov 02
" Usage: For detailed help, ":help ft-syntax-omni"
" History
"
+" Version 8.0
+" Updated SyntaxCSyntaxGroupItems()
+" - Some additional syntax items were also allowed
+" on nextgroup= lines which were ignored by default.
+" Now these lines are processed independently.
+"
" Version 7.0
" Updated syntaxcomplete#OmniSyntaxList()
" - Looking up the syntax groups defined from a syntax file
@@ -44,7 +50,7 @@ endif
if exists('g:loaded_syntax_completion')
finish
endif
-let g:loaded_syntax_completion = 70
+let g:loaded_syntax_completion = 80
" Set ignorecase to the ftplugin standard
" This is the default setting, but if you define a buffer local
@@ -72,7 +78,8 @@ endif
" This script will build a completion list based on the syntax
" elements defined by the files in $VIMRUNTIME/syntax.
let s:syn_remove_words = 'match,matchgroup=,contains,'.
- \ 'links to,start=,end=,nextgroup='
+ \ 'links to,start=,end='
+ " \ 'links to,start=,end=,nextgroup='
let s:cache_name = []
let s:cache_list = []
@@ -411,9 +418,25 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
\ , "\n", 'g'
\ )
- " Now strip off the newline + blank space + contained
+ " Now strip off the newline + blank space + contained.
+ " Also include lines with nextgroup=@someName skip_key_words syntax_element
+ let syn_list = substitute(
+ \ syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\|nextgroup=\)'
+ \ , "", 'g'
+ \ )
+
+ " This can leave lines like this
+ " =@vimMenuList skipwhite onoremenu
+ " Strip the special option keywords first
+ " :h :syn-skipwhite*
+ let syn_list = substitute(
+ \ syn_list, '\<\(skipwhite\|skipnl\|skipempty\)\>'
+ \ , "", 'g'
+ \ )
+
+ " Now remove the remainder of the nextgroup=@someName lines
let syn_list = substitute(
- \ syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\)'
+ \ syn_list, '\%(^\|\n\)\@<=\s*\(@\w\+\)'
\ , "", 'g'
\ )
View
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.3. Last change: 2011 Aug 29
+*autocmd.txt* For Vim version 7.3. Last change: 2011 Oct 26
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1061,8 +1061,8 @@ option will not cause any commands to be executed.
It's possible to use this inside an autocommand too,
so you can base the autocommands for one extension on
another extension. Example: >
- :au Bufenter *.cpp so ~/.vimrc_cpp
- :au Bufenter *.cpp doau BufEnter x.c
+ :au BufEnter *.cpp so ~/.vimrc_cpp
+ :au BufEnter *.cpp doau BufEnter x.c
< Be careful to avoid endless loops. See
|autocmd-nested|.
View
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 7.3. Last change: 2011 Jun 19
+*change.txt* For Vim version 7.3. Last change: 2011 Oct 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -71,7 +71,7 @@ For inserting text see |insert.txt|.
"D" deletes the highlighted text plus all text until
the end of the line. {not in Vi}
- *:d* *:de* *:del* *:delete*
+ *:d* *:de* *:del* *:delete* *:dl*
:[range]d[elete] [x] Delete [range] lines (default: current line) [into
register x].
View
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2011 Sep 30
+*eval.txt* For Vim version 7.3. Last change: 2011 Dec 14
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -615,7 +615,6 @@ Expression syntax summary, from least to most significant:
- expr7 unary minus
+ expr7 unary plus
-
|expr8| expr8[expr1] byte of a String or item of a |List|
expr8[expr1 : expr1] substring of a String or sublist of a |List|
expr8.name entry in a |Dictionary|
@@ -946,7 +945,8 @@ When expr8 is a |Funcref| type variable, invoke the function it refers to.
*expr9*
number
------
-number number constant *expr-number*
+number number constant *expr-number*
+ *hex-number* *octal-number*
Decimal, Hexadecimal (starting with 0x or 0X), or Octal (starting with 0).
@@ -1768,7 +1768,7 @@ foldtext( ) String line displayed for closed fold
foldtextresult( {lnum}) String text for closed fold at {lnum}
foreground( ) Number bring the Vim window to the foreground
function( {name}) Funcref reference to function {name}
-garbagecollect( [at_exit]) none free memory, breaking cyclic references
+garbagecollect( [{atexit}]) none free memory, breaking cyclic references
get( {list}, {idx} [, {def}]) any get item {idx} from {list} or {def}
get( {dict}, {key} [, {def}]) any get item {key} from {dict} or {def}
getbufline( {expr}, {lnum} [, {end}])
@@ -1844,7 +1844,8 @@ log( {expr}) Float natural logarithm (base e) of {expr}
log10( {expr}) Float logarithm of Float {expr} to base 10
map( {expr}, {string}) List/Dict change each item in {expr} to {expr}
maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
- String rhs of mapping {name} in mode {mode}
+ String or Dict
+ rhs of mapping {name} in mode {mode}
mapcheck( {name}[, {mode} [, {abbr}]])
String check for mappings matching {name}
match( {expr}, {pat}[, {start}[, {count}]])
@@ -3077,7 +3078,7 @@ function({name}) *function()* *E700*
{name} can be a user defined function or an internal function.
-garbagecollect([at_exit]) *garbagecollect()*
+garbagecollect([{atexit}]) *garbagecollect()*
Cleanup unused |Lists| and |Dictionaries| that have circular
references. There is hardly ever a need to invoke this
function, as it is automatically done when Vim runs out of
@@ -3087,7 +3088,7 @@ garbagecollect([at_exit]) *garbagecollect()*
This is useful if you have deleted a very big |List| and/or
|Dictionary| with circular references in a script that runs
for a long time.
- When the optional "at_exit" argument is one, garbage
+ When the optional {atexit} argument is one, garbage
collection will also be done when exiting Vim, if it wasn't
done before. This is useful when checking for memory leaks.
@@ -3163,6 +3164,8 @@ getchar([expr]) *getchar()*
one-byte character it is the character itself as a number.
Use nr2char() to convert it to a String.
+ Use getcharmod() to obtain any additional modifiers.
+
When the user clicks a mouse button, the mouse event will be
returned. The position can then be found in |v:mouse_col|,
|v:mouse_lnum| and |v:mouse_win|. This example positions the
@@ -3201,10 +3204,11 @@ getcharmod() *getcharmod()*
2 shift
4 control
8 alt (meta)
- 16 mouse double click
- 32 mouse triple click
- 64 mouse quadruple click
- 128 Macintosh only: command
+ 16 meta (when it's different from ALT)
+ 32 mouse double click
+ 64 mouse triple click
+ 96 mouse quadruple click (== 32 + 64)
+ 128 command (Macintosh only)
Only the modifiers that have not been included in the
character itself are obtained. Thus Shift-a results in "A"
without a modifier.
@@ -6258,6 +6262,7 @@ mouse_gpm Compiled with support for gpm (Linux console mouse)
mouse_netterm Compiled with support for netterm mouse.
mouse_pterm Compiled with support for qnx pterm mouse.
mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse)
+mouse_urxvt Compiled with support for urxvt mouse.
mouse_xterm Compiled with support for xterm mouse.
mouseshape Compiled with support for 'mouseshape'.
multi_byte Compiled with support for 'encoding'
View
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.3. Last change: 2011 Oct 12
+*map.txt* For Vim version 7.3. Last change: 2011 Oct 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -246,8 +246,8 @@ have these mappings: >
inoremap <expr> <C-L>x "foo"
If you now type CTRL-L nothing happens yet, Vim needs the next character to
decide what mapping to use. If you type 'x' the second mapping is used and
-"foo" is inserted. If you type 'a' the first mapping is used, getchar() gets
-the 'a' and returns it.
+"foo" is inserted. If you type any other key the first mapping is used,
+getchar() gets the typed key and returns it.
Here is an example that inserts a list number that increases: >
let counter = 0
View
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2011 Sep 30
+*options.txt* For Vim version 7.3. Last change: 2011 Dec 14
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -401,6 +401,9 @@ On Unix systems the form "${HOME}" can be used too. The name between {} can
contain non-id characters then. Note that if you want to use this for the
"gf" command, you need to add the '{' and '}' characters to 'isfname'.
+On MS-Windows, if $HOME is not defined as an environment variable, then
+at runtime Vim will set it to the expansion of $HOMEDRIVE$HOMEPATH.
+
NOTE: expanding environment variables and "~/" is only done with the ":set"
command, not when assigning a value to an option with ":let".
@@ -1217,7 +1220,8 @@ A jump table for the options with a short description can be found at |Q_op|.
|:bwipeout|
CAREFUL: when "unload", "delete" or "wipe" is used changes in a buffer
- are lost without a warning.
+ are lost without a warning. Also, these values may break autocommands
+ that switch between buffers temporarily.
This option is used together with 'buftype' and 'swapfile' to specify
special kinds of buffers. See |special-buffers|.
@@ -3554,8 +3558,8 @@ A jump table for the options with a short description can be found at |Q_op|.
screen.
*'guioptions'* *'go'*
-'guioptions' 'go' string (default "gmrLtT" (MS-Windows),
- "agimrLtT" (GTK, Motif and Athena))
+'guioptions' 'go' string (default "egmrLtT" (MS-Windows),
+ "aegimrLtT" (GTK, Motif and Athena))
global
{not in Vi}
{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|.
are not applied.
See also: 'incsearch' and |:match|.
When you get bored looking at the highlighted matches, you can turn it
- off with |:nohlsearch|. As soon as you use a search command, the
- highlighting comes back.
+ off with |:nohlsearch|. This does not change the option value, as
+ soon as you use a search command, the highlighting comes back.
'redrawtime' specifies the maximum time spent on finding matches.
When the search pattern can match an end-of-line, Vim will try to
highlight all of the matched text. However, this depends on where the
search starts. This will be the first line in the window or the first
line below a closed fold. A match in a previous line which is not
drawn may not continue in a newly drawn line.
+ You can specify whether the highlight status is restored on startup
+ with the 'h' flag in 'viminfo' |viminfo-h|.
NOTE: This option is reset when 'compatible' is set.
*'history'* *'hi'*
@@ -5241,7 +5247,7 @@ A jump table for the options with a short description can be found at |Q_op|.
recognized as a compressed file.
Only normal file name characters can be used, "/\*?[|<>" are illegal.
- *'path'* *'pa'* *E343* *E345* *E347*
+ *'path'* *'pa'* *E343* *E345* *E347* *E854*
'path' 'pa' string (default on Unix: ".,/usr/include,,"
on OS/2: ".,/emx/include,,"
other systems: ".,,")
@@ -7368,6 +7374,8 @@ A jump table for the options with a short description can be found at |Q_op|.
jsbterm JSB term mouse handling.
*pterm-mouse*
pterm QNX pterm mouse handling.
+ *urxvt-mouse*
+ urxvt Mouse handling for the urxvt (rxvt-unicode) terminal.
The mouse handling must be enabled at compile time |+mouse_xterm|
|+mouse_dec| |+mouse_netterm|.
@@ -7584,15 +7592,18 @@ A jump table for the options with a short description can be found at |Q_op|.
parameter. The following is a list of the identifying characters and
the effect of their value.
CHAR VALUE ~
+ *viminfo-!*
! When included, save and restore global variables that start
with an uppercase letter, and don't contain a lowercase
letter. Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
and "_K_L_M" are not. Nested List and Dict items may not be
read back correctly, you end up with an empty item.
+ *viminfo-quote*
" Maximum number of lines saved for each register. Old name of
the '<' item, with the disadvantage that you need to put a
backslash before the ", otherwise it will be recognized as the
start of a comment!
+ *viminfo-%*
% When included, save and restore the buffer list. If Vim is
started with a file name argument, the buffer list is not
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|.
When followed by a number, the number specifies the maximum
number of buffers that are stored. Without a number all
buffers are stored.
+ *viminfo-'*
' Maximum number of previously edited files for which the marks
are remembered. This parameter must always be included when
'viminfo' is non-empty.
Including this item also means that the |jumplist| and the
|changelist| are stored in the viminfo file.
+ *viminfo-/*
/ Maximum number of items in the search pattern history to be
saved. If non-zero, then the previous search and substitute
patterns are also saved. When not included, the value of
'history' is used.
+ *viminfo-:*
: Maximum number of items in the command-line history to be
saved. When not included, the value of 'history' is used.
+ *viminfo-<*
< Maximum number of lines saved for each register. If zero then
registers are not saved. When not included, all lines are
saved. '"' is the old name for this item.
Also see the 's' item below: limit specified in Kbyte.
+ *viminfo-@*
@ Maximum number of items in the input-line history to be
saved. When not included, the value of 'history' is used.
+ *viminfo-c*
c When included, convert the text in the viminfo file from the
'encoding' used when writing the file to the current
'encoding'. See |viminfo-encoding|.
+ *viminfo-f*
f Whether file marks need to be stored. If zero, file marks ('0
to '9, 'A to 'Z) are not stored. When not present or when
non-zero, they are all stored. '0 is used for the current
cursor position (when exiting or when doing ":wviminfo").
+ *viminfo-h*
h Disable the effect of 'hlsearch' when loading the viminfo
file. When not included, it depends on whether ":nohlsearch"
has been used since the last search command.
+ *viminfo-n*
n Name of the viminfo file. The name must immediately follow
the 'n'. Must be the last one! If the "-i" argument was
given when starting Vim, that file name overrides the one
given here with 'viminfo'. Environment variables are expanded
when opening the file, not when setting the option.
+ *viminfo-r*
r Removable media. The argument is a string (up to the next
','). This parameter can be given several times. Each
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|.
also use it for temp files, e.g., for Unix: "r/tmp". Case is
ignored. Maximum length of each 'r' argument is 50
characters.
+ *viminfo-s*
s Maximum size of an item in Kbyte. If zero then registers are
not saved. Currently only applies to registers. The default
"s10" will exclude registers with more than 10 Kbyte of text.
Oops, something went wrong.

0 comments on commit 7feea41

Please sign in to comment.