diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-02-28 13:11:45 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-02-28 13:11:45 +0100 |
commit | 2b8388bd0175835eb751e6c58cd0b0b69465f0d9 (patch) | |
tree | b7892d80060965dfc435285655b8f104c51c2fc0 /runtime | |
parent | bac203ea2d0e3b2a5e4eae4dbe48244e592926e2 (diff) |
Updated runtime files.
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/change.txt | 24 | ||||
-rw-r--r-- | runtime/doc/editing.txt | 5 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 10 | ||||
-rw-r--r-- | runtime/doc/if_ruby.txt | 12 | ||||
-rw-r--r-- | runtime/doc/index.txt | 7 | ||||
-rw-r--r-- | runtime/doc/options.txt | 21 | ||||
-rw-r--r-- | runtime/doc/pattern.txt | 4 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 7 | ||||
-rw-r--r-- | runtime/doc/tags | 2 | ||||
-rw-r--r-- | runtime/doc/term.txt | 6 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 74 | ||||
-rw-r--r-- | runtime/ftplugin/spec.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/asterisk.vim | 14 | ||||
-rw-r--r-- | runtime/syntax/c.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/cobol.vim | 10 | ||||
-rw-r--r-- | runtime/syntax/make.vim | 14 | ||||
-rw-r--r-- | runtime/syntax/pfmain.vim | 251 |
17 files changed, 363 insertions, 108 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 0a5bc94faf..c5f4cb40a3 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.4. Last change: 2015 Jan 27 +*change.txt* For Vim version 7.4. Last change: 2015 Feb 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1192,12 +1192,14 @@ if none of buffers matches the given name. 7. Expression register "= *quote_=* *quote=* *@=* This is not really a register that stores text, but is a way to use an expression in commands which use a register. The expression register is -read-only; you cannot put text into it. After the '=', the cursor moves to -the command-line, where you can enter any expression (see |expression|). All -normal command-line editing commands are available, including a special -history for expressions. When you end the command-line by typing <CR>, Vim -computes the result of the expression. If you end it with <Esc>, Vim abandons -the expression. If you do not enter an expression, Vim uses the previous +read-write. + +When typing the '=' after " or CTRL-R the cursor moves to the command-line, +where you can enter any expression (see |expression|). All normal +command-line editing commands are available, including a special history for +expressions. When you end the command-line by typing <CR>, Vim computes the +result of the expression. If you end it with <Esc>, Vim abandons the +expression. If you do not enter an expression, Vim uses the previous expression (like with the "/" command). The expression must evaluate to a String. A Number is always automatically @@ -1242,7 +1244,7 @@ Contains the most recent search-pattern. This is used for "n" and 'hlsearch'. It is writable with `:let`, you can change it to have 'hlsearch' highlight other matches without actually searching. You can't yank or delete into this register. The search direction is available in |v:searchforward|. -Note that the valued is restored when returning from a function +Note that the value is restored when returning from a function |function-search-undo|. {not in Vi} @@ -1457,10 +1459,10 @@ When you hit Return in a C-comment, Vim will insert the middle comment leader for the new line: " * ". To close this comment you just have to type "/" before typing anything else on the new line. This will replace the middle-comment leader with the end-comment leader and apply any specified -alignment, leaving just " */". There is no need to hit BackSpace first. +alignment, leaving just " */". There is no need to hit Backspace first. -When there is a match with a middle part, but there also is a maching end part -which is longer, the end part is used. This makes a C style comment work +When there is a match with a middle part, but there also is a matching end +part which is longer, the end part is used. This makes a C style comment work without requiring the middle part to end with a space. Here is an example of alignment flags at work to make a comment stand out diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 4b8e536df5..816d45f434 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2015 Jan 04 +*editing.txt* For Vim version 7.4. Last change: 2015 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -304,7 +304,8 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is Mnemonic: "goto file". Uses the 'isfname' option to find out which characters are supposed to be in a file name. Trailing - punctuation characters ".,:;!" are ignored. + punctuation characters ".,:;!" are ignored. Escaped + spaces "\ " are reduced to a single space. Uses the 'path' option as a list of directory names to look for the file. See the 'path' option for details about relative directories and wildcards. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 2c395326e7..e9a5dc936c 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2015 Jan 29 +*eval.txt* For Vim version 7.4. Last change: 2015 Feb 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3314,7 +3314,7 @@ getchar([expr]) *getchar()* : endwhile :endfunction < - You may also receive syntetic characters, such as + You may also receive synthetic characters, such as |<CursorHold>|. Often you will want to ignore this and get another character: > :function GetKey() @@ -4828,7 +4828,7 @@ py3eval({expr}) *py3eval()* Evaluate Python expression {expr} and return its result converted to Vim data structures. Numbers and strings are returned as they are (strings are - copied though, unicode strings are additionally converted to + copied though, Unicode strings are additionally converted to 'encoding'). Lists are represented as Vim |List| type. Dictionaries are represented as Vim |Dictionary| type with @@ -5567,7 +5567,7 @@ setwinvar({nr}, {varname}, {val}) *setwinvar()* :call setwinvar(2, "myvar", "foobar") sha256({string}) *sha256()* - Returns a String with 64 hex charactes, which is the SHA256 + Returns a String with 64 hex characters, which is the SHA256 checksum of {string}. {only available when compiled with the |+cryptv| feature} @@ -8280,7 +8280,7 @@ You can catch all Vim errors by the pattern > *catch-text* NOTE: You should never catch the error message text itself: > :catch /No such variable/ -only works in the english locale, but not when the user has selected +only works in the English locale, but not when the user has selected a different language by the |:language| command. It is however helpful to cite the message text in a comment: > :catch /^Vim(\a\+):E108:/ " No such variable diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 0a32d87851..4084181f97 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.4. Last change: 2012 Aug 02 +*if_ruby.txt* For Vim version 7.4. Last change: 2015 Feb 22 VIM REFERENCE MANUAL by Shugo Maeda @@ -120,9 +120,13 @@ VIM::command({cmd}) *ruby-evaluate* VIM::evaluate({expr}) Evaluates {expr} using the vim internal expression evaluator (see - |expression|). Returns the expression result as a string. - A |List| is turned into a string by joining the items and inserting - line breaks. + |expression|). Returns the expression result as: + - a Integer if the Vim expression evaluates to a number + - a Float if the Vim expression evaluates to a float + - a String if the Vim expression evaluates to a string + - a Array if the Vim expression evaluates to a Vim list + - a Hash if the Vim expression evaluates to a Vim dictionary + Dictionaries and lists are recursively expanded. ============================================================================== 3. VIM::Buffer objects *ruby-buffer* diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 1e0134d68f..e8171a90e4 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.4. Last change: 2015 Jan 07 +*index.txt* For Vim version 7.4. Last change: 2015 Feb 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -702,12 +702,16 @@ tag char note action in Normal mode ~ |g'| g'{mark} 1 like |'| but without changing the jumplist |g`| g`{mark} 1 like |`| but without changing the jumplist |gstar| g* 1 like "*", but without using "\<" and "\>" +|g+| g+ go to newer text state N times +|g,| g, 1 go to N newer position in change list +|g-| g- go to older text state N times |g0| g0 1 when 'wrap' off go to leftmost character of the current line that is on the screen; when 'wrap' on go to the leftmost character of the current screen line |g8| g8 print hex value of bytes used in UTF-8 character under the cursor +|g;| g; 1 go to N older position in change list |g<| g< display previous command output |g?| g? 2 Rot13 encoding operator |g?g?| g?? 2 Rot13 encode current line @@ -736,6 +740,7 @@ tag char note action in Normal mode ~ the screen; when 'wrap' on go to the leftmost non-white character of the current screen line +|g_| g_ 1 cursor to the last CHAR N - 1 lines lower |ga| ga print ascii value of character under the cursor |gd| gd 1 go to definition of word under the cursor diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 193e323b79..39c3270fd2 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2015 Jan 27 +*options.txt* For Vim version 7.4. Last change: 2015 Feb 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -536,11 +536,11 @@ number can be specified where "vim:" or "Vim:" is used: vim<{vers}: version before {vers} vim={vers}: version {vers} vim>{vers}: version after {vers} -{vers} is 600 for Vim 6.0 (hundred times the major version plus minor). -For example, to use a modeline only for Vim 6.0 and later: - /* vim600: set foldmethod=marker: */ ~ -To use a modeline for Vim before version 5.7: - /* vim<570: set sw=4: */ ~ +{vers} is 700 for Vim 7.0 (hundred times the major version plus minor). +For example, to use a modeline only for Vim 7.0: + /* vim700: set foldmethod=marker */ ~ +To use a modeline for Vim after version 7.2: + /* vim>702: set cole=2: */ ~ There can be no blanks between "vim" and the ":". @@ -1316,8 +1316,9 @@ A jump table for the options with a short description can be found at |Q_op|. nofile only: The buffer name is fixed, it is not handled like a file name. It is not modified in response to a |:cd| command. - nofile only: When using ":e bufname" and already editing "bufname" - nothing changes, since there is no file to edit. + both: When using ":e bufname" and already editing "bufname" + the buffer is made empty and autocommands are + triggered as usual for |:edit|. *E676* "acwrite" implies that the buffer name is not related to a file, like "nofile", but it will be written. Thus, in contrast to "nofile" and @@ -2950,8 +2951,8 @@ A jump table for the options with a short description can be found at |Q_op|. 2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat' is set to "unix". Note that when a <NL> is found without a preceding <CR>, "unix" is preferred over "dos". - 3. If 'fileformat' has not yet been set, and if 'fileformats' - includes "mac", 'fileformat' is set to "mac". + 3. If 'fileformat' has not yet been set, and if a <CR> is found, and + if 'fileformats' includes "mac", 'fileformat' is set to "mac". This means that "mac" is only chosen when: "unix" is not present or no <NL> is found in the file, and "dos" is not present or no <CR><NL> is found in the file. diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 322811b7cf..323f16711a 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 Sep 06 +*pattern.txt* For Vim version 7.4. Last change: 2015 Feb 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -59,6 +59,8 @@ explanations are in chapter 27 |usr_27.txt|. *n* n Repeat the latest "/" or "?" [count] times. + If the cursor doesn't move the search is repeated with + count + 1. |last-pattern| {Vi: no count} *N* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index fdafb677e9..5587edcf97 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.4. Last change: 2015 Feb 03 +*syntax.txt* For Vim version 7.4. Last change: 2015 Feb 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -211,7 +211,8 @@ thing. These are then linked to a highlight group that specifies the color. A syntax group name doesn't specify any color or attributes itself. The name for a highlight or syntax group must consist of ASCII letters, digits -and the underscore. As a regexp: "[a-zA-Z0-9_]*" +and the underscore. As a regexp: "[a-zA-Z0-9_]*". However, Vim does not give +an error when using other characters. To be able to allow each user to pick his favorite set of colors, there must be preferred names for highlight groups that are common for many languages. @@ -4253,7 +4254,7 @@ If the "maxlines={N}" argument is given, the number of lines that are searched for a comment or syncing pattern is restricted to N lines backwards (after adding "minlines"). This is useful if you have few things to sync on and a slow machine. Example: > - :syntax sync ccomment maxlines=500 + :syntax sync maxlines=500 ccomment < *:syn-sync-linebreaks* When using a pattern that matches multiple lines, a change in one line may diff --git a/runtime/doc/tags b/runtime/doc/tags index c4c4c8c050..c08344de92 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -995,6 +995,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 't_ve' term.txt /*'t_ve'* 't_vi' term.txt /*'t_vi'* 't_vs' term.txt /*'t_vs'* +'t_xn' term.txt /*'t_xn'* 't_xs' term.txt /*'t_xs'* 'ta' options.txt /*'ta'* 'tabline' options.txt /*'tabline'* @@ -8203,6 +8204,7 @@ t_vb term.txt /*t_vb* t_ve term.txt /*t_ve* t_vi term.txt /*t_vi* t_vs term.txt /*t_vs* +t_xn term.txt /*t_xn* t_xs term.txt /*t_xs* tab intro.txt /*tab* tab-page tabpage.txt /*tab-page* diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 842f69b656..2ad4f67784 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.4. Last change: 2014 May 13 +*term.txt* For Vim version 7.4. Last change: 2015 Feb 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -283,8 +283,8 @@ OUTPUT CODES *t_xs* *'t_xs'* t_xs if non-empty, standout not erased by overwriting (hpterm) *t_xn* *'t_xn'* - t_xn if non-empty, character writing at the last cell of screen - didn't causes scrolling + t_xn if non-empty, writing a character at the last screen cell + does not cause scrolling t_ZH italics mode *t_ZH* *'t_ZH'* t_ZR italics end *t_ZR* *'t_ZR'* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 00e70349a0..0da2222553 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2015 Feb 03 +*todo.txt* For Vim version 7.4. Last change: 2015 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -35,6 +35,8 @@ not be repeated below, unless there is extra information. -------------------- Known bugs and current work ----------------------- Regexp problems: +- The old engine does not find a match for "/\%#=1\(\)\{80}", the new engine + matches everywhere. - Using win_linetabsize() can still be slow. Cache the result, store col and vcol. Reset them when moving to another line. - Very slow with a long line and Ruby highlighting. (John Whitley, 2014 Dec 4) @@ -51,9 +53,13 @@ Regexp problems: - Does not work with NFA regexp engine: \%u, \%x, \%o, \%d followed by a composing character - Bug relating to back references. (Ingo Karkat, 2014 Jul 24) +- New RE does not give an error for empty group: "\(\)\{2}" (Dominique Pelle, + 2015 Feb 7) - Using back reference before the capturing group sometimes works with the old engine, can we do this with the new engine? E.g. with "/\%(<\1>\)\@<=.*\%(<\/\(\w\+\)>\)\@=" matching text inside HTML tags. +- Strange matching with "\(Hello\n\)\@<=A". (Anas Syed, 2015 Feb 12) +- Problem with \v(A)@<=b+\1c. (Issue 334) - Diff highlighting can be very slow. (Issue 309) - Using %> for a virtual column has a check based on 'tabsize'. Better would be to cache the result of win_linetabsize(col), storing both col and vcol, @@ -62,12 +68,18 @@ Regexp problems: - this doesn't work: "syntax match ErrorMsg /.\%9l\%>20c\&\%<28c/". Leaving out the \& works. Seems any column check after \& fails. +Check out neovim bug reports that apply to Vim: +https://github.com/neovim/neovim/issues?q=label%3Abug-vim +Specifically: +https://github.com/neovim/neovim/commit/cf8e175cf54281bcad5e704308e92ebb3e6381d3 +https://github.com/neovim/neovim/commit/d7038127ca6b356ad33fdec08aa3b23ac6a817af +https://github.com/neovim/neovim/commit/77ace65bdce379f2d9b13ee81ab3fc01951f92dc + Still using freed memory after using setloclist(). (lcd, 2014 Jul 23) More info Jul 24. Not clear why. -Docs: "= register is writable. (Christian Brabandt, 2015 Jan 28) - -New syntax file for pfmain. (Anton Shestakov, 2015 Feb 2) +Better .ico file for Windows. (Pat Suwalski, 2015 Feb 13) +Waiting for response on remark from Edward Fox. Patch to make getregtype() return the right size for non-linux systems. (Yasuhiro Matsumoto, 2014 Jul 8) @@ -88,22 +100,24 @@ Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) MS-Windows: When editing a file with a leading space, writing it uses the wrong name. (Aram, 2014 Nov 7) Vim 7.4. +Can't recognize the $ProgramFiles(x86) environment variable. Recognize it +specifically? First try with the parens, then without. + Value returned by virtcol() changes depending on how lines wrap. This is inconsistent with the documentation. Better greek spell checking. Issue 299. -On MS-Windows running tests with Mercurial has problems when the fileformat of -the input files are changed. (Ken Takata, Taro Muraoka, 2014 Sep 25) -Update Nov 5. +When complete() first argument is before where insert started and 'backspace' +is Vi compatible, the completion fails. (Hirohito Higashi, 2015 Feb 19) + +Weird encryption problems on Windows. (Ben Fritz, 2015 Feb 13) +Goes away when disabling the swap file. (might1, Feb 16) MS-Windows: Crash opening very long file name starting with "\\". (Christian Brock, 2012 Jun 29) -Patch to add "tn" termcap feature, whether Vim can write in the last screen -cell. (Hayaki Saito, 2015 Jan 28) - -Patch to fix getting buffer number for autocommand. (Lech Lorens, 2015 Jan 27) +Syntax files for Innovation Data processing. (Rob Owens, 2015 Feb 4) Add a few features to xxd. (Vadim Vygonets, 2013 Nov 11) Patches: 2013 Nov 19 @@ -111,21 +125,34 @@ Patches: 2013 Nov 19 2: Add -o: add offset to displayed position 3: Change displayed file position width to 8 chars -Undo messes up text. Issue 324. -Patch from Christian on the issue. - Using CTRL-L while popup menu is visible behaves like CTRL-P, which is wrong. Patch by Yasuhiro Matsumoto, 2015 Jan 5. Is this right? Comment from Amadeus Demarzi. Another patch from Christian, Jan 6. -Comment from Hirohito Higashi, Jan 6. +Comment from Hirohito Higashi, Jan 6, update Feb 8, update Feb 17. + +HTML indenting: adjustments for html5. (Michaelpg, 2015 Feb 23) + +glob() omits symbolic links to non-existing files. +(Charles Campbell, 2015 Feb 19) +Patch by James McCoy, 2015 Feb 20. +Docs change suggestion by Roland Eggner, 2015 Feb 21. +Probably "to a not existing file" should be "to a non-existing file". Cursorline background color not mixed with character highlight. Patch by Yasuhiro Matsumoto, 2014 Dec 3. +Patch to fix temp directories for Windows, so that it works without tweaking. +Issue 28. +Also see http://superuser.com/questions/364879/how-to-open-a-new-file-in-gvim-e303-unable-to-open-swap-file + Problem using diff syntax with cp932 encoding. Idea from Yasuhiro Matsumoto, patch from Ken Takata (2014 Nov 6) +text deleted by "dit" depends on indent of closing tag. +(Jan Parthey, 2015 Feb 8) +Patch by Christian, Feb 9. Update Feb 13. + ml_updatechunk() is slow when retrying for another encoding. (John Little, 2014 Sep 11) @@ -146,7 +173,7 @@ Patch to add an argument to ":ls" for specific kinds of buffers. Crash when using R syntax. (Jakson Alves de Aquino, 2015 Jan 30) Memory freed by ":syn clear" but still referenced, syntax items referenced -from two windows? +from two windows? Stopped happening (Feb 5). Window height computed incorrectly when Vim is minimized. Patch to fix this. (Ingo Karkat, 2014 Dec 19) @@ -157,18 +184,20 @@ Patch to fix CTRL-W handling in Insert mode for multi-byte characters. Patch to allow values greater than 255 for ctermfg/ctermbg on Windows. (Yasuhiro Matsumoto, 2014 Dec 5) +Patch for an extra argument to matchadd() for conceal. (Christian Brabandt, +2015 Feb 17, update Feb 19) + Mixup of highlighting when there is a match and SpellBad. (ZyX, 2015 Jan 1) Problem caused by patch 7.3.638: window->open does not update window correctly. Issue 91. With patch. Patch to add 'belloff' option. (Christian Brabandt, 2015 Jan 31) +Update Feb 6. Patch for drag&drop reordering of GUI tab pages reordering. (Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe) -'ff' is wrong for one-line file without EOL. (Patch on Issue 77) - Patch on Issue 72: 'autochdir' causes problems for :vimgrep. When 'balloonexpr' returns a list the result has a trailing newline. @@ -192,6 +221,9 @@ lines. (Marco Hinz, 2014 Nov 2) Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) +Should be easy to highlight all matches with 'incsearch'. Idea by Itchyny, +2015 Feb 6. + Plugins need to make a lot of effort, lots of mappings, to know what happened before pressing the key that triggers a plugin action. How about keeping the last N pressed keys, so that they do not need to be mapped? @@ -379,9 +411,6 @@ Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14) Several syntax file match "^\s*" which may get underlined if that's in the highlight group. Add a "\zs" after it? -Patch to fix temp directories for Windows, so that it works without tweaking. -Issue 28. - Go through more coverity reports. Patch to add ":undorecover", get as much text out of the undo file as @@ -2108,8 +2137,6 @@ Awaiting updated patches: Search in 'runtimepath'? More docs needed about how to use this. How to get the messages into the .po files? - strchars() Like strlen() and strwidth() but counting characters - instead of bytes. confirm() add "flags" argument, with 'v' for vertical layout and 'c' for console dialog. (Haegg) Flemming Madsen has a patch for the 'c' flag @@ -4659,7 +4686,6 @@ Searching: should be ignored (like "*/" or "#endif" inside /* */). Also: use "%" to jump from start to end of syntax region and back. Alternative: use matchit.vim -8 "/:/e+1" gets stuck on a match at the end of the line. Do we care? 8 A pattern like "\([^a]\+\)\+" takes an awful long time. Recognize that the recursive "\+" is meaningless and optimize for it. This one is also very slow on "/* some comment */": "^\/\*\(.*[^/]\)*$". diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim index c3af8a9fca..d4576598e0 100644 --- a/runtime/ftplugin/spec.vim +++ b/runtime/ftplugin/spec.vim @@ -2,7 +2,7 @@ " Filename: spec.vim " Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com " Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014) -" Last Change: Sun Mar 2 11:24 MSK 2014 Igor Gnatenko +" Last Change: Fri Feb 20 16:01 MSK 2014 Igor Gnatenko if exists("b:did_ftplugin") finish @@ -18,7 +18,9 @@ if !exists("no_plugin_maps") && !exists("no_spec_maps") endif endif -noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR> +if !hasmapto("call <SID>SpecChangelog(\"\")<CR>") + noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR> +endif if !exists("*s:SpecChangelog") function s:SpecChangelog(format) diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim index 58e867d42a..fd4ec39c91 100644 --- a/runtime/syntax/asterisk.vim +++ b/runtime/syntax/asterisk.vim @@ -1,8 +1,9 @@ " Vim syntax file " Language: Asterisk config file -" Maintainer: brc007 +" Maintainer: Jean Aunis <jean.aunis@yahoo.fr> +" Previous Maintainer: brc007 " Updated for 1.2 by Tilghman Lesher (Corydon76) -" Last Change: 2006 Mar 20 +" Last Change: 2015 Feb 27 " version 0.4 " if version < 600 @@ -17,18 +18,19 @@ syn sync fromstart syn keyword asteriskTodo TODO contained syn match asteriskComment ";.*" contains=asteriskTodo syn match asteriskContext "\[.\{-}\]" -syn match asteriskExten "^\s*exten\s*=>\?\s*[^,]\+" contains=asteriskPattern +syn match asteriskExten "^\s*\zsexten\s*=>\?\s*[^,]\+\ze," contains=asteriskPattern nextgroup=asteriskPriority +syn match asteriskExten "^\s*\zssame\s*=>\?\s*\ze" nextgroup=asteriskPriority syn match asteriskExten "^\s*\(register\|channel\|ignorepat\|include\|\(no\)\?load\)\s*=>\?" syn match asteriskPattern "_\(\[[[:alnum:]#*\-]\+\]\|[[:alnum:]#*]\)*\.\?" contained syn match asteriskPattern "[^A-Za-z0-9,]\zs[[:alnum:]#*]\+\ze" contained syn match asteriskApp ",\zs[a-zA-Z]\+\ze$" syn match asteriskApp ",\zs[a-zA-Z]\+\ze(" " Digits plus oldlabel (newlabel) -syn match asteriskPriority ",\zs[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel +syn match asteriskPriority "\zs[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel " oldlabel plus digits (newlabel) -syn match asteriskPriority ",\zs[[:alpha:]][[:alnum:]_]*+[[:digit:]]\+\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel +syn match asteriskPriority "\zs[[:alpha:]][[:alnum:]_]*+[[:digit:]]\+\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel " s or n plus digits (newlabel) -syn match asteriskPriority ",\zs[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel +syn match asteriskPriority "\zs[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel syn match asteriskLabel "(\zs[[:alpha:]][[:alnum:]]*\ze)" contained syn match asteriskError "^\s*#\s*[[:alnum:]]*" syn match asteriskInclude "^\s*#\s*\(include\|exec\)\s.*" diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index 128e1a2a4a..a520e6317f 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2014 Nov 13 +" Last Change: 2015 Feb 27 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -330,6 +330,8 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu") " POSIX 2001 syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG syn keyword cConstant SIGVTALRM SIGXCPU SIGXFSZ + " non-POSIX signals + syn keyword cConstant SIGWINCH SIGINFO " Add POSIX errors as well syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim index 5315e75211..51ca3d8773 100644 --- a/runtime/syntax/cobol.vim +++ b/runtime/syntax/cobol.vim @@ -1,10 +1,10 @@ " Vim syntax file -" Language: COBOL -" Maintainer: Tim Pope <vimNOSPAM@tpope.info> +" Language: COBOL +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> " (formerly Davyd Ondrejko <vondraco@columbus.rr.com>) " (formerly Sitaram Chamarty <sitaram@diac.com> and -" James Mitchell <james_mitchell@acm.org>) -" $Id: cobol.vim,v 1.2 2007/05/05 18:23:43 vimboss Exp $ +" James Mitchell <james_mitchell@acm.org>) +" Last Change: 2015 Feb 13 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -145,7 +145,7 @@ syn match cobolString /'[^']*\('\|$\)/ syn match cobolIndicator "\%7c[D-]" contained if exists("cobol_legacy_code") - syn region cobolCondFlow contains=ALLBUT,cobolLine start="\<\(IF\|INVALID\|END\|EOP\)\>" skip=/\('\|"\)[^"]\{-}\("\|'\|$\)/ end="\." keepend + syn region cobolCondFlow contains=ALLBUT,cobolLine,cobolBadLine start="\<\(IF\|INVALID\|END\|EOP\)\>" skip=/\('\|"\)[^"]\{-}\("\|'\|$\)/ end="\." keepend endif " many legacy sources have junk in columns 1-6: must be before others diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 6fd46aaa54..35b09341a6 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -2,7 +2,7 @@ " Language: Makefile " Maintainer: Claudio Fleiner <claudio@fleiner.com> " URL: http://www.fleiner.com/vim/syntax/make.vim -" Last Change: 2012 Oct 05 +" Last Change: 2015 Feb 28 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -43,8 +43,8 @@ syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString syn match makeIdent "\$\$\w*" syn match makeIdent "\$[^({]" -syn match makeIdent "^ *\a\w*\s*[:+?!*]="me=e-2 -syn match makeIdent "^ *\a\w*\s*="me=e-1 +syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2 +syn match makeIdent "^ *[^:#= \t]*\s*="me=e-1 syn match makeIdent "%" " Makefile.in variables @@ -55,11 +55,11 @@ syn match makeConfig "@[A-Za-z0-9_]\+@" syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource -syn region makeTarget transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeTarget "^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError +syn region makeTarget transparent matchgroup=makeTarget start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands +syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget,makeComment skipnl nextgroup=makeCommands,makeCommandError -syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent skipnl nextgroup=makeCommands,makeCommandError +syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands +syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent,makeComment skipnl nextgroup=makeCommands,makeCommandError syn match makeCommandError "^\s\+\S.*" contained syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim index a0904457a2..32ed6975c0 100644 --- a/runtime/syntax/pfmain.vim +++ b/runtime/syntax/pfmain.vim @@ -1,11 +1,11 @@ " Vim syntax file " Language: Postfix main.cf configuration " Maintainer: KELEMEN Peter <Peter dot Kelemen at cern dot ch> -" Last Update: Hong Xu -" Last Change: 2011 May 14 +" Last Updates: Anton Shestakov, Hong Xu +" Last Change: 2015 Feb 10 " Version: 0.40 " URL: http://cern.ch/fuji/vim/syntax/pfmain.vim -" Comment: Based on Postfix 2.9 defaults. +" Comment: Based on Postfix 2.12/3.0 postconf.5.html. if version < 600 syntax clear @@ -41,6 +41,7 @@ syntax keyword pfmainConf address_verify_relayhost syntax keyword pfmainConf address_verify_sender syntax keyword pfmainConf address_verify_sender_dependent_default_transport_maps syntax keyword pfmainConf address_verify_sender_dependent_relayhost_maps +syntax keyword pfmainConf address_verify_sender_ttl syntax keyword pfmainConf address_verify_service_name syntax keyword pfmainConf address_verify_transport_maps syntax keyword pfmainConf address_verify_virtual_transport @@ -52,6 +53,7 @@ syntax keyword pfmainConf allow_min_user syntax keyword pfmainConf allow_percent_hack syntax keyword pfmainConf allow_untrusted_routing syntax keyword pfmainConf alternate_config_directories +syntax keyword pfmainConf always_add_missing_headers syntax keyword pfmainConf always_bcc syntax keyword pfmainConf anvil_rate_time_unit syntax keyword pfm |