# HG changeset patch # User Bram Moolenaar # Date 1383964918 -3600 # Node ID d060c429b21f4200124f21961c16eb67dbea208b # Parent f0bffd7a32931d2189acaa72533fd1174c90071b Updated runtime files. diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.4. Last change: 2013 Aug 25 +*change.txt* For Vim version 7.4. Last change: 2013 Nov 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -475,8 +475,8 @@ If the 'shiftround' option is on, the in 'shiftwidth'. If the 'smartindent' option is on, or 'cindent' is on and 'cinkeys' contains -'#', shift right does not affect lines starting with '#' (these are supposed -to be C preprocessor lines that must stay in column 1). +'#' with a zero value, shift right does not affect lines starting with '#' +(these are supposed to be C preprocessor lines that must stay in column 1). When the 'expandtab' option is off (this is the default) Vim uses s as much as possible to make the indent. You can use ">><<" to replace an indent diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2013 Nov 02 +*eval.txt* For Vim version 7.4. Last change: 2013 Nov 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4235,6 +4235,9 @@ matchadd({group}, {pattern}[, {priority} "match"). It will be highlighted with {group}. Returns an identification number (ID), which can be used to delete the match using |matchdelete()|. + Matching is case sensitive and magic, unless case sensitivity + or magicness are explicitly overridden in {pattern}. The + 'magic', 'smartcase' and 'ignorecase' options are not used. The optional {priority} argument assigns a priority to the match. A match with a high priority will have its diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.4. Last change: 2013 Aug 03 +*indent.txt* For Vim version 7.4. Last change: 2013 Nov 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2013 Aug 22 +*options.txt* For Vim version 7.4. Last change: 2013 Nov 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4902,6 +4902,7 @@ builtin_terms term.txt /*builtin_terms* byte-count editing.txt /*byte-count* byte2line() eval.txt /*byte2line()* byteidx() eval.txt /*byteidx()* +byteidxcomp() eval.txt /*byteidxcomp()* bzip2 pi_gzip.txt /*bzip2* c change.txt /*c* c.vim syntax.txt /*c.vim* @@ -6360,6 +6361,7 @@ hl-WarningMsg syntax.txt /*hl-WarningMsg hl-WildMenu syntax.txt /*hl-WildMenu* hlID() eval.txt /*hlID()* hlexists() eval.txt /*hlexists()* +hlsearch-variable eval.txt /*hlsearch-variable* holy-grail index.txt /*holy-grail* home intro.txt /*home* home-replace editing.txt /*home-replace* @@ -8366,6 +8368,7 @@ v:folddashes eval.txt /*v:folddashes* v:foldend eval.txt /*v:foldend* v:foldlevel eval.txt /*v:foldlevel* v:foldstart eval.txt /*v:foldstart* +v:hlsearch eval.txt /*v:hlsearch* v:insertmode eval.txt /*v:insertmode* v:key eval.txt /*v:key* v:lang eval.txt /*v:lang* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2013 Nov 03 +*todo.txt* For Vim version 7.4. Last change: 2013 Nov 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,7 +34,12 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -Revert patch 7.4.056? Do it differently? +Patch From Lech Lorens doesn't quite work: +Problem: When using ":'<,'>del" errors may be given for the visual line + numbers being out of range. +Solution: Reset Visual mode in ":del". (Lech Lorens) +Files: src/ex_docmd.c + Using \1 in pattern goes one line too far. (Bohr Shaw, 2013 Sep 5) Column is OK. "/\v(^.+\n)\1/e" (John Little, Sep 5) @@ -58,59 +63,23 @@ Problem using ":try" inside ":execute". Issue 164: freeze on regexp search. -Patch to Fix Python: DictionaryContains return -1 on error. (ZyX, 2013 Nov 1) - -Patch to fix that inserting CR when replacing a Visual block doesn't cause a -line break. (Christian Brabandt, 2013 Oct 19) -Check: does CTRL-V CR insert a literal CR? New patch Oct 21 -With test Oct 22. - -When recording the character typed at the hit-enter prompt is recorded twice. -(Urtica Dioica) Patch by Christian Brabandt, 2013 Oct 8. - Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in ftplugins. Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) -Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep -5) Only copy file name when needed: Sep 9. - -After inserting comment leader, CTRL-\ CTRL-O does move the cursor. -(Wiktor Ruben, 2013 Oct 7) -Patch by Christian Brabandt. - Patch to support slices in Python vim.List. (ZyX, 2013 Oct 20) Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2) -Patch to avoid "-no-cpp-precomp" on Mac. (Misty De Meo, demeo, 2013 Oct 19) - Patch to make Dictionary.update() work without arguments. (ZyX, 2013 Oct 19) -Patch to make #N in 'cino' stop not indenting #lines. (Christian Brabandt, -2013 Sep 25) - Patch for Cobol ftplugin. (ZyX, 2013 Oct 20) Await response from maintainer. -Can 'undolevels' be a buffer-local option? Helps for making big changes in -one file only, set 'ul' to -1 only for that buffer. -Patch by Christian Brabandt, 2010 Dec 17. Needs test. - Include systemverilog file? Two votes yes. -Wrapping around end of file does not work for "." after "cgn". (Dimitar -Dimitrov) -Patch by Christian Brabandt, 2013 Aug 22 - -Clang error for integer overflow. (Dominique Pelle, 2013 Sep 21) - -Patch to add v:hlsearch. (ZyX, 2013 Sep 22) - -Patch to fix E315 error. (Lech Lorens, 2013 Oct 26) - Patch to add :keeppatterns, don't put used search patterns in history. (Christian Brabandt, 2013 Oct 18) diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim --- a/runtime/syntax/svn.vim +++ b/runtime/syntax/svn.vim @@ -2,15 +2,18 @@ " Language: Subversion (svn) commit file " Maintainer: Dmitry Vasiliev " URL: https://github.com/hdima/vim-scripts/blob/master/syntax/svn.vim -" Last Change: 2012-07-21 +" Last Change: 2013-11-08 " Filenames: svn-commit*.tmp -" Version: 1.9 +" Version: 1.10 " Contributors: -" Stefano Zacchiroli +" +" List of the contributors in alphabetical order: +" " A. S. Budden +" Ingo Karkat " Myk Taylor -" Ingo Karkat +" Stefano Zacchiroli " For version 5.x: Clear all syntax items. " For version 6.x: Quit when a syntax file was already loaded. @@ -20,14 +23,19 @@ elseif exists("b:current_syntax") finish endif -syn region svnText start="\%^" end="^--.*--$"me=s-1 contains=@Spell +syn spell toplevel + +syn match svnFirstLine "\%^.*" nextgroup=svnRegion,svnBlank skipnl +syn match svnSummary "^.\{0,50\}" contained containedin=svnFirstLine nextgroup=svnOverflow contains=@Spell +syn match svnOverflow ".*" contained contains=@Spell +syn match svnBlank "^.*" contained contains=@Spell -syn region svnRegion start="^--.*--$" end="\%$" contains=ALL -syn match svnRemoved "^D .*$" contained -syn match svnRenamed "^R[ M][ U][ +] .*$" contained -syn match svnAdded "^A[ M][ U][ +] .*$" contained -syn match svnModified "^M[ M][ U] .*$" contained -syn match svnProperty "^_M[ U] .*$" contained +syn region svnRegion end="\%$" matchgroup=svnDelimiter start="^--.*--$" contains=svnRemoved,svnRenamed,svnAdded,svnModified,svnProperty,@NoSpell +syn match svnRemoved "^D .*$" contained contains=@NoSpell +syn match svnRenamed "^R[ M][ U][ +] .*$" contained contains=@NoSpell +syn match svnAdded "^A[ M][ U][ +] .*$" contained contains=@NoSpell +syn match svnModified "^M[ M][ U] .*$" contained contains=@NoSpell +syn match svnProperty "^_M[ U] .*$" contained contains=@NoSpell " Synchronization. syn sync clear @@ -44,7 +52,11 @@ if version >= 508 || !exists("did_svn_sy command -nargs=+ HiLink hi def link endif + HiLink svnSummary Keyword + HiLink svnBlank Error + HiLink svnRegion Comment + HiLink svnDelimiter NonText HiLink svnRemoved Constant HiLink svnAdded Identifier HiLink svnModified Special