diff options
-rw-r--r-- | runtime/doc/eval.txt | 7 | ||||
-rw-r--r-- | runtime/doc/indent.txt | 12 | ||||
-rw-r--r-- | runtime/doc/mbyte.txt | 6 | ||||
-rw-r--r-- | runtime/doc/options.txt | 5 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 16 | ||||
-rw-r--r-- | runtime/doc/tags | 3 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 71 | ||||
-rw-r--r-- | runtime/filetype.vim | 11 | ||||
-rw-r--r-- | runtime/ftplugin/help.vim | 5 | ||||
-rw-r--r-- | runtime/indent/dtd.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/bindzone.vim | 16 | ||||
-rw-r--r-- | runtime/syntax/c.vim | 53 | ||||
-rw-r--r-- | runtime/syntax/dnsmasq.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/dosini.vim | 5 | ||||
-rw-r--r-- | runtime/syntax/gnash.vim | 3 | ||||
-rw-r--r-- | runtime/syntax/help.vim | 17 | ||||
-rw-r--r-- | runtime/tutor/tutor.fr | 22 | ||||
-rw-r--r-- | runtime/tutor/tutor.fr.utf-8 | 22 | ||||
-rw-r--r-- | src/INSTALLpc.txt | 6 | ||||
-rw-r--r-- | src/po/eo.po | 151 | ||||
-rw-r--r-- | src/po/fr.po | 149 | ||||
-rw-r--r-- | src/testdir/test82.in | 93 | ||||
-rw-r--r-- | src/testdir/test82.ok | 2 |
23 files changed, 449 insertions, 234 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index bcc7fa3519..12d9504f3f 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2011 Jun 19 +*eval.txt* For Vim version 7.3. Last change: 2011 Jul 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2277,7 +2277,8 @@ char2nr({expr}) *char2nr()* < The current 'encoding' is used. Example for "utf-8": > char2nr("") returns 225 char2nr(""[0]) returns 195 -< |nr2char()| does the opposite. +< A combining character is a separate character. + |nr2char()| does the opposite. cindent({lnum}) *cindent()* Get the amount of indent for line {lnum} according the C @@ -5968,7 +5969,7 @@ virtcol({expr}) *virtcol()* When 'virtualedit' is used {expr} can be [lnum, col, off], where "off" is the offset in screen columns from the start of the character. E.g., a position within a <Tab> or after the last - character. + character. When "off" is omitted zero is used. When Virtual editing is active in the current mode, a position beyond the end of the line can be returned. |'virtualedit'| The accepted positions are: diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 44c76c2d9f..7767ce8911 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.3. Last change: 2011 May 31 +*indent.txt* For Vim version 7.3. Last change: 2011 Jul 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -486,9 +486,10 @@ The examples below assume a 'shiftwidth' of 4. ) ) < *java-cinoptions* *java-indenting* *cino-j* - jN Indent java anonymous classes correctly. The value 'N' is - currently unused but must be non-zero (e.g. 'j1'). 'j1' will - indent for example the following code snippet correctly: > + jN Indent Java anonymous classes correctly. Also works well for + Javascript. The value 'N' is currently unused but must be + non-zero (e.g. 'j1'). 'j1' will indent for example the + following code snippet correctly: > object.add(new ChangeListener() { public void stateChanged(ChangeEvent e) { @@ -499,7 +500,8 @@ The examples below assume a 'shiftwidth' of 4. *javascript-cinoptions* *javascript-indenting* *cino-J* JN Indent JavaScript object declarations correctly by not confusing them with labels. The value 'N' is currently unused but must be - non-zero (e.g. 'J1'). > + non-zero (e.g. 'J1'). If you enable this you probably also want + to set |cino-j|. > var bar = { foo: { diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index c4f227bd07..66af7b465e 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.3. Last change: 2011 Feb 01 +*mbyte.txt* For Vim version 7.3. Last change: 2011 Jul 18 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -1306,8 +1306,8 @@ character. However, search patterns may not match on an overlong sequence. character.) An exception is NUL (zero) which is displayed as "<00>". In the file and buffer the full range of Unicode characters can be used (31 -bits). However, displaying only works for 16 bit characters, and only for the -characters present in the selected font. +bits). However, displaying only works for the characters present in the +selected font. Useful commands: - "ga" shows the decimal, hexadecimal and octal value of the character under diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 7d8f926203..3bfc05a24f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2011 Jun 12 +*options.txt* For Vim version 7.3. Last change: 2011 Jul 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6002,7 +6002,8 @@ A jump table for the options with a short description can be found at |Q_op|. {not in Vi} When on, use temp files for shell commands. When off use a pipe. When using a pipe is not possible temp files are used anyway. - Currently a pipe is only supported on Unix. You can check it with: > + Currently a pipe is only supported on Unix and MS-Windows 2K and + later. You can check it with: > :if has("filterpipe") < The advantage of using a pipe is that nobody can read the temp file and the 'shell' command does not need to support redirection. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index ff8243a899..ad3cccc61e 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3. Last change: 2011 May 06 +*syntax.txt* For Vim version 7.3. Last change: 2011 Jul 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -866,13 +866,13 @@ used. Detecting whether a file is csh or tcsh is notoriously hard. Some systems symlink /bin/csh to /bin/tcsh, making it almost impossible to distinguish between csh and tcsh. In case VIM guesses wrong you can set the -"filetype_csh" variable. For using csh: > - - :let filetype_csh = "csh" +"filetype_csh" variable. For using csh: *g:filetype_csh* +> + :let g:filetype_csh = "csh" For using tcsh: > - :let filetype_csh = "tcsh" + :let g:filetype_csh = "tcsh" Any script with a tcsh extension or a standard tcsh filename (.tcshrc, tcsh.tcshrc, tcsh.login) will have filetype tcsh. All other tcsh/csh scripts @@ -2372,6 +2372,12 @@ This will make the syntax synchronization start 50 lines before the first displayed line. The default value is 10. The disadvantage of using a larger number is that redrawing can become slow. +Vim tries to guess what type a ".r" file is. If it can't be detected (from +comment lines), the default is "r". To make the default rexx add this line to +your .vimrc: *g:filetype_r* +> + :let g:filetype_r = "r" + RUBY *ruby.vim* *ft-ruby-syntax* diff --git a/runtime/doc/tags b/runtime/doc/tags index 70a382a180..e472a3b1ba 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5096,6 +5096,7 @@ cpo-+ options.txt /*cpo-+* cpo-- options.txt /*cpo--* cpo-. options.txt /*cpo-.* cpo-/ options.txt /*cpo-\/* +cpo-; options.txt /*cpo-;* cpo-< options.txt /*cpo-<* cpo-> options.txt /*cpo->* cpo-A options.txt /*cpo-A* @@ -5784,6 +5785,8 @@ g:decada.Error_Format ft_ada.txt /*g:decada.Error_Format* g:decada.Make() ft_ada.txt /*g:decada.Make()* g:decada.Make_Command ft_ada.txt /*g:decada.Make_Command* g:decada.Unit_Name() ft_ada.txt /*g:decada.Unit_Name()* +g:filetype_csh syntax.txt /*g:filetype_csh* +g:filetype_r syntax.txt /*g:filetype_r* g:gnat ft_ada.txt /*g:gnat* g:gnat.Error_Format ft_ada.txt /*g:gnat.Error_Format* g:gnat.Find() ft_ada.txt /*g:gnat.Find()* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 0572948661..613a25df70 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2011 Jun 19 +*todo.txt* For Vim version 7.3. Last change: 2011 Jul 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -40,52 +40,11 @@ Crash in autocomplete, valgrind log. (Greg Weber, 2011 Apr 22) Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) -Patch to fix gj with count. (James Vega, 2011 Jun 13) - -Patch to disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka, 2010 -Nov 25) - -7 Output for ":scriptnames" and ":breaklist" should shorten the file names: - use "~/" when possible. -Patch by Jean-Rene David, 2011 May 1. - -Cindent wrong after patch 7.3.202. (Lech Lorens, issue 9) - -Patch for cindent fix with closing brace placement, including tests. -(Lech Lorens, issue 10, 2011 Jun 12) - -Patch for better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan -20) -Change to C syntax folding to make it work much faster, but a bit less -reliable. (Lech Lorens, 2009 Nov 9) Enable with an option? -Most time is spent in in_id_list(). -Updated to merge both patches. (Ben Schmidt, 2011 May 2) - -GTK: Patch to fix menu popping down. (Hong Xu, 2010 Dec 4, Dec 5) -Update 2011 Feb 3. - -Patch to use pipes on Win32. (Vincent Berthoux, 2011 Feb 28) -Update Mar 1 using 'shelltemp'. - -Patch to fix CTRL-R CTRL-W in the command line when the cursor is not at the -end. (Tyru, 2011 Jun 6) - Patch to support UTF-8 for Hangul. (Shawn Y.H. Kim, 2011 May 1) Needs more work. -Patch to make ";" not get stuck on "t" command. (Christian Brabandt, 2011 May -23) - -Patch to do more testing of Javascript indenting. Some items are srong. -(Luc Deschenaux, 2011 Jun 14) - -"gh<Del>" deletes the current line, except when it's the last line. -Hint by Christian Brabandt, 2011 Mar 22 - -"echo 'abc' > ''" returns 0 or 1, depending on 'ignorecase'. -mb_strnicmp() checks for illegal and truncated bytes are wrong. -Should also not assume that byte length is equal before case folding. -Patch by Ivan Krasilnikov, 2011 May 27. +With "unamedplus" in 'clipboard' pasting in Visual mode causes error for empty +register. (Michael Seiwald, 2011 Jun 28) The :z command doesn't work exactly as it should. (ChangZhuo Chen, 2011 Mar 2) Compare with how old Vi works and with posix spec. terminal is 80 x 24, @@ -94,6 +53,7 @@ Compare with how old Vi works and with posix spec. terminal is 80 x 24, 'cursorline' is displayed too short when there are concealed characters and 'list' is set. (Dennis Preiser) Patch 7.3.116 was the wrong solution. +Christian Brabandt has another incomplete patch. (2011 Jul 13) With concealed text mouse click doesn't put the cursor in the right position. (Herb Sitz) Fix by Christian Brabandt, 2011 Jun 16. Doesn't work properly, @@ -119,8 +79,13 @@ Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20) Patch to automatically get version number into NSIS. (Guopeng Wen, 2011 May 27) +Patch to add more command completions (Dominique Pelle, 2011 Jun 25) + +Patch to have GvimExt not use "edit with existing Vim" entries. +(Jerome Vuarand, 2011 Jun 22) + Patch to make character classes work with multi-byte characters. -(Dominique Pelle, 2011 May 31) +(Dominique Pelle, 2011 May 31, update July 11) In GTK Gvim, setting 'lines' and 'columns' to 99999 causes a crash (Tony Mechelynck, 2011 Apr 25). Can reproduce the crash sometimes: @@ -143,6 +108,9 @@ Need for CursorHold that retriggers. Use a key that doesn't do anything, or a function that resets did_cursorhold. Patch by Christian Brabandt, 2011 May 6. +popup completion menu closes quickly when there is a fold in the buffer. (Jan +Christoph Ebersbach, 2011 Jul 3) + CursorHold repeats typed key when it's the start of a mapping. (Will Gray, 2011 Mar 23) Christian Brabandt: problem is that OP_PENDING isn't set. @@ -192,6 +160,10 @@ Bug in try/catch: return with invalid compare throws error that isn't caught. Highlighting stops working after changing it many times. Script to reproduce it: Pablo Contreras, 2010 Oct 12 Windows XP and 7. Font is never freed? +When setting a local option value from the global value, add a script ID that +indicates this, so that ":verbose set" can give a hint. Check with options in +the help file. + After patch 7.3.097 still get E15. (Yukihiro Nakadaira, 2011 Jan 18) Also for another example (ZyX, 2011 Jan 24) @@ -251,6 +223,9 @@ New esperanto spell file can't be processed. (Dominique Pelle, 2011 Jan 30) "L'Italie" noted as a spell error at start of the sentence. (Dominique Pelle, 2011 Feb 27) +Patch to fail if configure can't find an interface, such as Python. +(Shlomi Fish, 2011 Jul 11) + Copy/paste between Vim and Google chrome doesn't work well for multi-byte characters. (Ben Haskell, 2010 Sep 17) When putting text in the cut buffer (when exiting) and conversion doesn't work @@ -341,7 +316,7 @@ When writing a file > 2Gbyte, the reported number of bytes is negative. (Antonio Colombo, 2010 Dec 18) Patch: Let rare word highlighting overrule good word highlighting. -(Jakson A. Aquino, 2010 Jul 30) +(Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2) Patch to make more characters work in dialogs. (Yankwei Jia, 2010 Aug 4) @@ -429,6 +404,9 @@ characters. (2010 Aug 14, bootleq) Problem with stop directory in findfile(). (Adam Simpkins, 2009 Aug 26) +Using ']' as the end of a range in a pattern requires double escaping: + /[@-\\]] (Andy Wokula, 2011 Jun 28) + Undo problem: line not removed as expected when using setline() from Insert mode. (Israel Chauca, 2010 May 13, more in second msg) Break undo when CTRL-R = changes the text? Or save more lines? @@ -1525,6 +1503,7 @@ Awaiting updated patches: - Patch for 'breakindent' option: repeat indent for wrapped line. (Vaclav Smilauer, 2004 Sep 13, fix Oct 31, update 2007 May 30) Version for latest MacVim: Tobia Conforto, 2009 Nov 23 + More recent version: https://retracile.net/wiki/VimBreakIndent 8 Add a few more command names to the menus. Patch from Jiri Brezina (28 feb 2002). Will mess the translations... 7 ATTENTION dialog choices are more logical when "Delete it' appears diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 0fac73fadc..e4c0d1af5c 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2011 Jun 13 +" Last Change: 2011 Jul 17 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1588,8 +1588,13 @@ func! s:FTr() endif endfor - " Nothing recognized, assume Rexx - setf rexx + " Nothing recognized, use user default or assume Rexx + if exists("g:filetype_r") + exe "setf " . g:filetype_r + else + " Rexx used to be the default, but R appears to be much more popular. + setf r + endif endfunc " Remind diff --git a/runtime/ftplugin/help.vim b/runtime/ftplugin/help.vim index fdac41064d..a0a0f292eb 100644 --- a/runtime/ftplugin/help.vim +++ b/runtime/ftplugin/help.vim @@ -13,7 +13,10 @@ set cpo&vim let b:undo_ftplugin = "setl fo< tw< cole< cocu<" -setlocal formatoptions+=tcroql textwidth=78 cole=2 cocu=nc +setlocal formatoptions+=tcroql textwidth=78 +if has("conceal") + setlocal cole=2 cocu=nc +endif let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/indent/dtd.vim b/runtime/indent/dtd.vim index 42a8789332..4350dfbe2f 100644 --- a/runtime/indent/dtd.vim +++ b/runtime/indent/dtd.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: DTD (Document Type Definition for XML) " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2010-09-21 +" Latest Revision: 2011-07-08 let s:cpo_save = &cpo set cpo&vim @@ -52,7 +52,7 @@ function s:indent_to_innermost_parentheses(line, end) let end = a:end let parentheses = [end - 1] while token != "" - let [token, end] = s:lex(a:line, end, '^\%([(),|]\|[A-Za-z0-9_-]\+\|#PCDATA\|%[A-Za-z0-9_-]\+;\)[?*+]\=') + let [token, end] = s:lex(a:line, end, '^\%([(),|]\|[A-Za-z0-9_-]\+\|#P\=CDATA\|%[A-Za-z0-9_-]\+;\)[?*+]\=') if token[0] == '(' call add(parentheses, end - 1) elseif token[0] == ')' diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim index 8db83f91da..d599a85db2 100644 --- a/runtime/syntax/bindzone.vim +++ b/runtime/syntax/bindzone.vim @@ -1,13 +1,13 @@ " Vim syntax file -" Language: BIND zone files (RFC1035) +" Language: BIND zone files (RFC 1035) " Maintainer: Julian Mehnle <julian@mehnle.net> " URL: http://www.mehnle.net/source/odds+ends/vim/syntax/ -" Last Change: Thu 2006-04-20 12:30:45 UTC +" Last Change: Thu 2011-07-16 20:42:00 UTC " " Based on an earlier version by Вячеслав Горбанев (Slava Gorbanev), with " heavy modifications. " -" $Id: bindzone.vim,v 1.2 2006/04/20 22:06:21 vimboss Exp $ +" $Id: bindzone.vim 12 2011-07-16 21:09:57Z julian $ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -23,7 +23,7 @@ syn case match syn region zoneRRecord start=/^/ end=/$/ contains=zoneOwnerName,zoneSpecial,zoneTTL,zoneClass,zoneRRType,zoneComment,zoneUnknown syn match zoneDirective /^\$ORIGIN\s\+/ nextgroup=zoneOrigin,zoneUnknown -syn match zoneDirective /^\$TTL\s\+/ nextgroup=zoneNumber,zoneUnknown +syn match zoneDirective /^\$TTL\s\+/ nextgroup=zoneTTL,zoneUnknown syn match zoneDirective /^\$INCLUDE\s\+/ nextgroup=zoneText,zoneUnknown syn match zoneDirective /^\$GENERATE\s/ @@ -34,9 +34,9 @@ syn match zoneOrigin contained /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\ syn match zoneDomain contained /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\^`{|}~]\+\(\s\|;\|$\)\@=/ syn match zoneSpecial contained /^[@*.]\s/ -syn match zoneTTL contained /\<\d[0-9HhWwDd]*\>/ nextgroup=zoneClass,zoneRRType skipwhite -syn keyword zoneClass contained IN CHAOS nextgroup=zoneRRType,zoneTTL skipwhite -syn keyword zoneRRType contained A AAAA CNAME HINFO MX NS PTR SOA SRV TXT nextgroup=zoneRData skipwhite +syn match zoneTTL contained /\s\@<=\d[0-9WwDdHhMmSs]*\(\s\|$\)\@=/ nextgroup=zoneClass,zoneRRType skipwhite +syn keyword zoneClass contained IN CHAOS nextgroup=zoneRRType,zoneTTL skipwhite +syn keyword zoneRRType contained A AAAA CNAME DNAME HINFO MX NS PTR SOA SRV TXT SPF nextgroup=zoneRData skipwhite syn match zoneRData contained /[^;]*/ contains=zoneDomain,zoneIPAddr,zoneIP6Addr,zoneText,zoneNumber,zoneParen,zoneUnknown syn match zoneIPAddr contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{,3}\>/ @@ -66,7 +66,7 @@ syn match zoneNumber contained /\<[0-9]\+\(\s\|;\|$\)\@=/ syn match zoneSerial contained /\<[0-9]\{9,10}\(\s\|;\|$\)\@=/ syn match zoneErrParen /)/ -syn region zoneParen contained start="(" end=")" contains=zoneSerial,zoneNumber,zoneComment +syn region zoneParen contained start="(" end=")" contains=zoneSerial,zoneTTL,zoneNumber,zoneComment syn match zoneComment /;.*/ " Define the default highlighting. diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index a0b94ae973..28c89c3b44 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: 2009 Nov 17 +" Last Change: 2011 May 2 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -72,7 +72,7 @@ endif " This should be before cErrInParen to avoid problems with #define ({ xxx }) if exists("c_curly_error") syntax match cCurlyError "}" - syntax region cBlock start="{" end="}" contains=ALLBUT,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold + syntax region cBlock start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold else syntax region cBlock start="{" end="}" transparent fold endif @@ -80,31 +80,33 @@ endif "catch errors caused by wrong parenthesis and brackets " also accept <% for {, %> for }, <: for [ and :> for ] (C99) " But avoid matching <::. -syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOut,cCppOut2,cCppSkip,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom +syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom if exists("c_no_curly_error") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell + syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell " cCppParen: same as cParen but ends at end-of-line; used in cDefine syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell syn match cParenError display ")" syn match cErrInParen display contained "^[{}]\|^<%\|^%>" elseif exists("c_no_bracket_error") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell + syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell " cCppParen: same as cParen but ends at end-of-line; used in cDefine syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell syn match cParenError display ")" syn match cErrInParen display contained "[{}]\|<%\|%>" else - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell + syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell " cCppParen: same as cParen but ends at end-of-line; used in cDefine syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell syn match cParenError display "[\])]" syn match cErrInParen display contained "[\]{}]\|<%\|%>" - syn region cBracket transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell + syn region cBracket transparent start='\[\|<::\@!' end=']\|:>' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell " cCppBracket: same as cParen but ends at end-of-line; used in cDefine syn region cCppBracket transparent start='\[\|<::\@!' skip='\\$' excludenl end=']\|:>' end='$' contained contains=ALLBUT,@cParenGroup,cErrInParen,cParen,cBracket,cString,@Spell syn match cErrInBracket display contained "[);{}]\|<%\|%>" endif +syntax region cBadBlock keepend extend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold + "integer number, or floating point number without a dot and with "f". syn case ignore syn match cNumbers display transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOctalError,cOctal @@ -270,27 +272,39 @@ if !exists("c_no_c99") " ISO C99 endif " Accept %: for # (C99) -syn region cPreCondit start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError -syn match cPreCondit display "^\s*\(%:\|#\)\s*\(else\|endif\)\>" +syn region cPreCondit start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError +syn match cPreConditMatch display "^\s*\(%:\|#\)\s*\(else\|endif\|elif\)\>" if !exists("c_no_if0") + syn cluster cCppOutInGroup contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip + syn region cCppOutWrapper start="^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse + syn region cCppOutIf contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse + if !exists("c_no_if0_fold") + syn region cCppOutIf2 contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip + else + syn region cCppOutIf2 contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip fold + endif + syn region cCppOutElse contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit + syn region cCppInWrapper start="^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse + syn region cCppInIf contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit if !exists("c_no_if0_fold") - syn region cCppOut start="^\s*\(%:\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=cCppOut2 fold + syn region cCppInElse contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold else - syn region cCppOut start="^\s*\(%:\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=cCppOut2 + syn region cCppInElse contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 endif - syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip - syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip + syn region cCppInElse2 contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip + syn region cCppOutSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip + syn region cCppInSkip contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc endif syn region cIncluded display contained start=+"+ skip=+\\\\\|\\"+ end=+"+ syn match cIncluded display contained "<[^>]*>" syn match cInclude display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded "syn match cLineSkip "\\$" -syn cluster cPreProcGroup contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOut,cCppOut2,cCppSkip,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti +syn cluster cPreProcGroup contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti syn region cDefine start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell syn region cPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell " Highlight User Labels -syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOut,cCppOut2,cCppSkip,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString +syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell " Avoid matching foo::bar() in C++ by requiring that the next char is not ':' syn cluster cLabelGroup contains=cUserLabel @@ -354,6 +368,9 @@ hi def link cDefine Macro hi def link cIncluded cString hi def link cError Error hi def link cStatement Statement +hi def link cCppInWrapper cCppOutWrapper +hi def link cCppOutWrapper cPreCondit +hi def link cPreConditMatch cPreCondit hi def link cPreCondit PreCondit hi def link cType Type hi def link cConstant Constant @@ -365,8 +382,10 @@ hi def link cComment Comment hi def link cSpecial SpecialChar hi def link cTodo Todo hi def link cBadContinuation Error -hi def link cCppSkip cCppOut -hi def link cCppOut2 cCppOut +hi def link cCppOutSkip cCppOutIf2 +hi def link cCppInElse2 cCppOutIf2 +hi def link cCppOutIf2 cCppOut2 " Old syntax group for #if 0 body +hi def link cCppOut2 cCppOut " Old syntax group for #if of #if 0 hi def link cCppOut Comment let b:current_syntax = "c" diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim index 80248201f1..39f106c3fd 100644 --- a/runtime/syntax/dnsmasq.vim +++ b/runtime/syntax/dnsmasq.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: dnsmasq(8) configuration file " Maintainer: Thilo Six <T.Six@gmx.de> -" Last Change: 17 May 2011 +" Last Change: 2011 Jul 14 " Credits: This file is a mix of cfg.vim, wget.vim and xf86conf.vim, credits go to: " Igor N. Prischepoff " Doug Kearns @@ -58,7 +58,7 @@ syn match DnsmasqString "'.*'" syn match DnsmasqComment "^#.*$" contains=DnsmasqTodo syn match DnsmasqComment "\s#.*$" contains=DnsmasqTodo -syn keyword DnsmasqTodo FIXME TODO XXX NOT contained +syn keyword DnsmasqTodo FIXME TODO XXX NOTE contained syn match DnsmasqKeywordSpecial "\<set\>:"me=e-1 syn match DnsmasqKeywordSpecial "\<tag\>:"me=e-1 diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim index 219384fc78..9cdc1d2de0 100644 --- a/runtime/syntax/dosini.vim +++ b/runtime/syntax/dosini.vim @@ -3,7 +3,8 @@ " Version Info: @(#)dosini.vim 1.6 97/12/15 08:54:12 " Author: Sean M. McKee <mckee@misslink.net> " Maintainer: Nima Talebi <nima@it.net.au> -" Last Change: Mon, 26 Jun 2006 22:07:28 +1000 +" Updated By: Hong Xu +" Last Change: 2011 Jul 16 " For version 5.x: Clear all syntax items @@ -19,7 +20,7 @@ syn case ignore syn match dosiniLabel "^.\{-}=" syn region dosiniHeader start="^\[" end="\]" -syn match dosiniComment "^;.*$" +syn match dosiniComment "^[#;].*$" " Define the default highlighting. " For version 5.7 and earlier: only when not done already diff --git a/runtime/syntax/gnash.vim b/runtime/syntax/gnash.vim index 97d5aa4cea..9b8e6072f0 100644 --- a/runtime/syntax/gnash.vim +++ b/runtime/syntax/gnash.vim @@ -2,7 +2,7 @@ " Language: gnash(1) configuration files " http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc " Maintainer: Thilo Six <T.Six@gmx.de> -" Last Change: 17 May 2011 +" Last Change: 2011 Jul 02 " Credidts: derived from readline.vim " Nikolai Weibull " @@ -32,6 +32,7 @@ syn case match syn match GnashSet '^\s*set\>' syn match GnashSet '^\s*append\>' +syn case ignore syn match GnashKeyword '\<CertDir\>' syn match GnashKeyword '\<ASCodingErrorsVerbosity\>' syn match GnashKeyword '\<CertFile\>' diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index 82c346826d..98c40f571c 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2010 Nov 03 +" Last Change: 2011 Jul 11 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -21,8 +21,13 @@ else syn match helpHyperTextEntry "\*[#-)!+-~]\+\*\s"he=e-1 contains=helpStar syn match helpHyperTextEntry "\*[#-)!+-~]\+\*$" contains=helpStar endif -syn match helpBar contained "|" conceal -syn match helpStar contained "\*" conceal +if has("conceal") + syn match helpBar contained "|" conceal + syn match helpStar contained "\*" conceal +else + syn match helpBar contained "|" + syn match helpStar contained "\*" +endif syn match helpNormal "|.*====*|" syn match helpNormal ":|vim:|" " for :help modeline syn match helpVim "Vim version [0-9.a-z]\+" @@ -31,7 +36,11 @@ syn match helpOption "'[a-z]\{2,\}'" syn match helpOption "'t_..'" syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore -syn match helpIgnore "." contained conceal +if has("conceal") + syn match helpIgnore "." contained conceal +else + syn match helpIgnore "." contained +endif syn keyword helpNote note Note NOTE note: Note: NOTE: Notes Notes: syn match helpSpecial "\<N\>" syn match helpSpecial "\<N\.$"me=e-1 diff --git a/runtime/tutor/tutor.fr b/runtime/tutor/tutor.fr index abb53d18f7..e9dd1ed031 100644 --- a/runtime/tutor/tutor.fr +++ b/runtime/tutor/tutor.fr @@ -1,5 +1,5 @@ =============================================================================== -= B i e n v e n u e dans |