From e968e36a00ddc735d493906f04eb207ff9aeb87c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 13 May 2014 20:23:24 +0200 Subject: Update runtime files. --- runtime/autoload/phpcomplete.vim | 10 +++--- runtime/doc/autocmd.txt | 5 +-- runtime/doc/editing.txt | 17 +++++----- runtime/doc/eval.txt | 2 +- runtime/doc/map.txt | 24 ++++++++++---- runtime/doc/options.txt | 42 +++++++++++++---------- runtime/doc/pattern.txt | 2 +- runtime/doc/sign.txt | 3 +- runtime/doc/term.txt | 6 ++-- runtime/doc/todo.txt | 72 ++++++++++++++-------------------------- runtime/doc/various.txt | 6 ++-- runtime/macros/less.vim | 27 ++++++++++++++- 12 files changed, 121 insertions(+), 95 deletions(-) diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim index 2ff94ced2..88c3e253a 100644 --- a/runtime/autoload/phpcomplete.vim +++ b/runtime/autoload/phpcomplete.vim @@ -2,6 +2,8 @@ " Language: PHP " Maintainer: Dávid Szabó ( complex857 AT gmail DOT com ) " Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) +" URL: https://github.com/shawncplus/phpcomplete.vim +" Last Change: 2014 May 08 " " OPTIONS: " @@ -16,7 +18,7 @@ " The completion list generated this way is only filtered by the completion base " and generally not much more accurate then simple keyword completion. " -" let g:phpcomplete_search_tags_for_variables = 1/0 [default 0] +" let g:phpcomplete_search_tags_for_variables = 1/0 [default 0] " Enables use of tags when the plugin tries to find variables. " When enabled the plugin will search for the variables in the tag files with kind 'v', " lines like $some_var = new Foo; but these usually yield highly inaccurate results and @@ -138,7 +140,7 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{ unlet! b:compl_context " chop of the "base" from the end of the current instruction if a:base != "" - let context = substitute(context, '\s*\$\?\([a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\)*$', '', '') + let context = substitute(context, '\s*[$a-zA-Z_0-9\x7f-\xff]*$', '', '') end end @@ -1553,12 +1555,14 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor " do in-file lookup of $var = new Class if line =~# '^\s*'.object.'\s*=\s*new\s\+'.class_name_pattern && !object_is_array let classname_candidate = matchstr(line, object.'\c\s*=\s*new\s*\zs'.class_name_pattern.'\ze') + let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, a:current_namespace, a:imports) break endif " in-file lookup for Class::getInstance() if line =~# '^\s*'.object.'\s*=&\?\s*'.class_name_pattern.'\s*::\s*getInstance' && !object_is_array let classname_candidate = matchstr(line, object.'\s*=&\?\s*\zs'.class_name_pattern.'\ze\s*::\s*getInstance') + let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, a:current_namespace, a:imports) break endif @@ -1822,8 +1826,6 @@ function! phpcomplete#GetFunctionLocation(function_name, namespace) " {{{ if no_namespace_candidate != '' return no_namespace_candidate endif -endif - endfunction " }}} diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index ecb5b963d..2a8becebf 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.4. Last change: 2014 Jan 23 +*autocmd.txt* For Vim version 7.4. Last change: 2014 May 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -569,7 +569,8 @@ FileChangedRO Before making the first change to a read-only FileChangedShell When Vim notices that the modification time of a file has changed since editing started. Also when the file attributes of the file - change. |timestamp| + change or when the size of the file changes. + |timestamp| Mostly triggered after executing a shell command, but also with a |:checktime| command or when Gvim regains input focus. diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index cc3dcfac6..9b465e846 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2013 Nov 25 +*editing.txt* For Vim version 7.4. Last change: 2014 May 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1469,14 +1469,15 @@ Notes: ============================================================================== 10. Timestamps *timestamp* *timestamps* -Vim remembers the modification timestamp of a file when you begin editing it. -This is used to avoid that you have two different versions of the same file -(without you knowing this). +Vim remembers the modification timestamp, mode and size of a file when you +begin editing it. This is used to avoid that you have two different versions +of the same file (without you knowing this). -After a shell command is run (|:!cmd| |suspend| |:read!| |K|) timestamps are -compared for all buffers in a window. Vim will run any associated -|FileChangedShell| autocommands or display a warning for any files that have -changed. In the GUI this happens when Vim regains input focus. +After a shell command is run (|:!cmd| |suspend| |:read!| |K|) timestamps, +file modes and file sizes are compared for all buffers in a window. Vim will +run any associated |FileChangedShell| autocommands or display a warning for +any files that have changed. In the GUI this happens when Vim regains input +focus. *E321* *E462* If you want to automatically reload a file when it has been changed outside of diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 395750820..965c5b80e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2014 Apr 29 +*eval.txt* For Vim version 7.4. Last change: 2014 May 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index d77197996..4eb36b89c 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.4. Last change: 2013 Aug 22 +*map.txt* For Vim version 7.4. Last change: 2014 May 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -306,9 +306,21 @@ is disabled. This makes it possible to map zero without making it impossible to type a count with a zero. *map-overview* *map-modes* -Overview of which map command works in which mode: - - commands: modes: ~ +Overview of which map command works in which mode. More details below. + COMMANDS MODES ~ +:map :noremap :unmap Normal, Visual, Select, Operator-pending +:nmap :nnoremap :nunmap Normal +:vmap :vnoremap :vunmap Visual and Select +:smap :snoremap :sunmap Select +:xmap :xnoremap :xunmap Visual +:omap :onoremap :ounmap Operator-pending +:map! :noremap! :unmap! Insert and Command-line +:imap :inoremap :iunmap Insert +:lmap :lnoremap :lunmap Insert, Command-line, Lang-Arg +:cmap :cnoremap :cunmap Command-line + + + COMMANDS MODES ~ Normal Visual+Select Operator-pending ~ :map :noremap :unmap :mapclear yes yes yes :nmap :nnoremap :nunmap :nmapclear yes - - @@ -324,7 +336,7 @@ NOTE: Mapping a printable character in Select mode may confuse the user. It's better to explicitly use :xmap and :smap for printable characters. Or use :sunmap after defining the mapping. - commands: modes: ~ + COMMANDS MODES ~ Visual Select ~ :vmap :vnoremap :vunmap :vmapclear yes yes :xmap :xnoremap :xunmap :xmapclear yes - @@ -333,7 +345,7 @@ better to explicitly use :xmap and :smap for printable characters. Or use *mapmode-ic* *mapmode-i* *mapmode-c* *mapmode-l* Some commands work both in Insert mode and Command-line mode, some not: - commands: modes: ~ + COMMANDS MODES ~ Insert Command-line Lang-Arg ~ :map! :noremap! :unmap! :mapclear! yes yes - :imap :inoremap :iunmap :imapclear yes - - diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 8b2ee6d44..7c772dfcc 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2014 Apr 29 +*options.txt* For Vim version 7.4. Last change: 2014 May 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4492,6 +4492,8 @@ A jump table for the options with a short description can be found at |Q_op|. be able to execute Normal mode commands. This is the opposite of the 'keymap' option, where characters are mapped in Insert mode. + This option cannot be set from a |modeline| or in the |sandbox|, for + security reasons. Example (for Greek, in UTF-8): *greek* > :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz @@ -7508,8 +7510,8 @@ A jump table for the options with a short description can be found at |Q_op|. "s" = button state "c" = column plus 33 "r" = row plus 33 - This only works up to 223 columns! See "dec" for a - solution. + This only works up to 223 columns! See "dec", + "urxvt", and "sgr" for solutions. xterm2 Works like "xterm", but with the xterm reporting the mouse position while the mouse is dragged. This works much faster and more precise. Your xterm must at @@ -7531,29 +7533,35 @@ A jump table for the options with a short description can be found at |Q_op|. pterm QNX pterm mouse handling. *urxvt-mouse* urxvt Mouse handling for the urxvt (rxvt-unicode) terminal. + The mouse works only if the terminal supports this + encoding style, but it does not have 223 columns limit + unlike "xterm" or "xterm2". *sgr-mouse* sgr Mouse handling for the terminal that emits SGR-styled - mouse reporting. Works with xterm version 277 or - later. + mouse reporting. The mouse works even in columns + beyond 223. This option is backward compatible with + "xterm2" because it can also decode "xterm2" style + mouse codes. The mouse handling must be enabled at compile time |+mouse_xterm| - |+mouse_dec| |+mouse_netterm|. + |+mouse_dec| |+mouse_netterm| |+mouse_jsbterm| |+mouse_urxvt| + |+mouse_sgr|. Only "xterm"(2) is really recognized. NetTerm mouse codes are always recognized, if enabled at compile time. DEC terminal mouse codes are recognized if enabled at compile time, and 'ttymouse' is not - "xterm" (because the xterm and dec mouse codes conflict). + "xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict + with them). This option is automatically set to "xterm", when the 'term' option is - set to a name that starts with "xterm", and 'ttymouse' is not "xterm" - or "xterm2" already. The main use of this option is to set it to - "xterm", when the terminal name doesn't start with "xterm", but it can - handle xterm mouse codes. - The "sgr" value will be set if the xterm version is 277 or later. + set to a name that starts with "xterm", "mlterm", or "screen", and + 'ttymouse' is not set already. + Additionally, if vim is compiled with the |+termresponse| feature and + |t_RV| is set to the escape sequence to request the xterm version + number, more intelligent detection process runs. The "xterm2" value will be set if the xterm version is reported to be - 95 or higher. This only works when compiled with the |+termresponse| - feature and if |t_RV| is set to the escape sequence to request the - xterm version number. Otherwise "xterm2" must be set explicitly. - If you do not want 'ttymouse' to be set to "xterm2" automatically, set - t_RV to an empty string: > + from 95 to 276. The "sgr" value will be set if the xterm version is + 277 or highter. + If you do not want 'ttymouse' to be set to "xterm2" or "sgr" + automatically, set t_RV to an empty string: > :set t_RV= < *'ttyscroll'* *'tsl'* diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 8bc621c9c..89300929f 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.4. Last change: 2014 Feb 08 +*pattern.txt* For Vim version 7.4. Last change: 2014 May 13 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 79c101109..6c9207307 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.4. Last change: 2013 Nov 17 +*sign.txt* For Vim version 7.4. Last change: 2014 May 07 VIM REFERENCE MANUAL by Gordon Prieur @@ -137,6 +137,7 @@ PLACING SIGNS *:sign-place* *E158* :sign place {id} line={lnum} name={name} buffer={nr} Same, but use buffer {nr}. + *E885* :sign place {id} name={name} file={fname} Change the placed sign {id} in file {fname} to use the defined sign {name}. See remark above about {fname} |:sign-fname|. diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index eb5d7fb57..d2dd54706 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.4. Last change: 2013 Mar 13 +*term.txt* For Vim version 7.4. Last change: 2014 May 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -666,8 +666,8 @@ When the X-server clipboard is available, the command server described in *xterm-copy-paste* NOTE: In some (older) xterms, it's not possible to move the cursor past column -95. This is an xterm problem, not Vim's. Get a newer xterm |color-xterm|. -Now the limit is 223 columns. +95 or 223. This is an xterm problem, not Vim's. Get a newer xterm +|color-xterm|. Also see |'ttymouse'|. Copy/paste in xterm with (current mode NOT included in 'mouse'): 1. Press left mouse button on first letter of text, move mouse pointer to last diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 0587c0fcf..ce06f2610 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2014 Apr 30 +*todo.txt* For Vim version 7.4. Last change: 2014 May 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -35,24 +35,17 @@ not be repeated below, unless there is extra information. -------------------- Known bugs and current work ----------------------- Regexp problems: -- NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria - Shallon, 2013 Nov 18) -- After patch 7.4.100 there is still a difference between NFA and old engine. - 25 a's with pattern \v^(aa+)\1+$ (Urtica Dioica, 2013 Nov 21) Also: 9 a's - with pattern \v^(a{-2,})\1+$ (Nov 23) -- NFA engine combining character mismatch. (glts, 2013 Aug 27) - Remark from Dominique, Aug 27 +- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@ and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin Szamotulski Remark from Brett 2014 Jan 6 and 7. -- Bug with back references. (Lech Lorens, 2014 Feb 3) - Bug when using \>. (Ramel, 2014 Feb 2) (Aaron Bohannon, 2014 Feb 13) - -Update for documentation of 'ttymouse' option. (Hayaki Saito, 2014 Apr 30) -Typo: s/support/supports/ +- NFA regexp doesn't handle \% -" Last Change: 2012 May 18 +" Last Change: 2014 May 13 " Avoid loading this file twice, allow the user to define his own script. if exists("loaded_less") @@ -87,6 +87,9 @@ noremap