Mercurial > vim
changeset 2608:7d8af31066c8
Updated runtime files and translations.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 20 Oct 2010 18:45:33 +0200 |
| parents | 2f57d93bdbf6 |
| children | 758822790b43 |
| files | runtime/compiler/gcc.vim runtime/doc/eval.txt runtime/doc/if_pyth.txt runtime/doc/options.txt runtime/doc/quickfix.txt runtime/doc/sign.txt runtime/doc/todo.txt runtime/doc/version7.txt runtime/doc/vi_diff.txt runtime/ftplugin/changelog.vim runtime/ftplugin/docbk.vim runtime/syntax/gpg.vim runtime/syntax/r.vim runtime/syntax/yaml.vim src/po/it.po src/po/sv.po |
| diffstat | 16 files changed, 237 insertions(+), 166 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/compiler/gcc.vim +++ b/runtime/compiler/gcc.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: GNU C Compiler " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2010-05-30 +" Latest Revision: 2010-10-14 if exists("current_compiler") finish @@ -18,10 +18,10 @@ CompilerSet errorformat= \\"%f\"%*\\D%l:\ %m, \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once, \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.), - \%f:%l:%c:\ %terror:\ %m, + \%f:%l:%c:\ %trror:\ %m, \%f:%l:%c:\ %tarning:\ %m, \%f:%l:%c:\ %m, - \%f:%l:\ %terror:\ %m, + \%f:%l:\ %trror:\ %m, \%f:%l:\ %tarning:\ %m, \%f:%l:\ %m, \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2010 Sep 29 +*eval.txt* For Vim version 7.3. Last change: 2010 Oct 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1934,6 +1934,7 @@ synID( {lnum}, {col}, {trans}) Number sy synIDattr( {synID}, {what} [, {mode}]) String attribute {what} of syntax ID {synID} synIDtrans( {synID}) Number translated syntax ID of {synID} +synconcealed( {lnum}, {col}) List info about concealing synstack( {lnum}, {col}) List stack of syntax IDs at {lnum} and {col} system( {expr} [, {input}]) String output of shell command/filter {expr} tabpagebuflist( [{arg}]) List list of buffer numbers in tab page @@ -5558,20 +5559,6 @@ synID({lnum}, {col}, {trans}) *synID( :echo synIDattr(synID(line("."), col("."), 1), "name") < -synconcealed({lnum}, {col}) *synconcealed()* - The result is a List. The first item in the list is 0 if the - character at the position {lnum} and {col} is not part of a - concealable region, 1 if it is. The second item in the list is - a string. If the first item is 1, the second item contains the - text which will be displayed in place of the concealed text, - depending on the current setting of 'conceallevel'. The third - and final item in the list is a unique number representing the - specific syntax region matched. This allows detection of the - beginning of a new concealable region if there are two - consecutive regions with the same replacement character. - For an example use see $VIMRUNTIME/syntax/2html.vim . - - synIDattr({synID}, {what} [, {mode}]) *synIDattr()* The result is a String, which is the {what} attribute of syntax ID {synID}. This can be used to obtain information @@ -5612,6 +5599,20 @@ synIDtrans({synID}) *synIDtrans()* highlight the character. Highlight links given with ":highlight link" are followed. +synconcealed({lnum}, {col}) *synconcealed()* + The result is a List. The first item in the list is 0 if the + character at the position {lnum} and {col} is not part of a + concealable region, 1 if it is. The second item in the list is + a string. If the first item is 1, the second item contains the + text which will be displayed in place of the concealed text, + depending on the current setting of 'conceallevel'. The third + and final item in the list is a unique number representing the + specific syntax region matched. This allows detection of the + beginning of a new concealable region if there are two + consecutive regions with the same replacement character. + For an example use see $VIMRUNTIME/syntax/2html.vim . + + synstack({lnum}, {col}) *synstack()* Return a |List|, which is the stack of syntax items at the position {lnum} and {col} in the current window. Each item in
--- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.3. Last change: 2010 Aug 13 +*if_pyth.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Paul Moore @@ -355,7 +355,7 @@ When Python 2 and Python 3 are both supp When doing this on Linux/Unix systems and importing global symbols, this leads to a crash when the second Python version is used. So either global symbols are loaded but only one Python version is activated, or no global symbols are -loaded. The latter makes Python's "import" fail on libaries that expect the +loaded. The latter makes Python's "import" fail on libraries that expect the symbols to be provided by Vim. *E836* *E837* Vim's configuration script makes a guess for all libraries based on one
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2010 Sep 21 +*options.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1496,6 +1496,25 @@ A jump table for the options with a shor feature} Number of screen lines to use for the command-line window. |cmdwin| + *'colorcolumn'* *'cc'* +'colorcolumn' 'cc' string (default "") + local to window + {not in Vi} + {not available when compiled without the |+syntax| + feature} + 'colorcolumn' is a comma separated list of screen columns that are + highlighted with ColorColumn |hl-ColorColumn|. Useful to align + text. Will make screen redrawing slower. + The screen column can be an absolute number, or a number preceded with + '+' or '-', which is added to or subtracted from 'textwidth'. > + + :set cc=+1 " highlight column after 'textwidth' + :set cc=+1,+2,+3 " highlight three columns after 'textwidth' + :hi ColorColumn ctermbg=lightgrey guibg=lightgrey +< + When 'textwidth' is zero then the items with '-' and '+' are not used. + A maximum of 256 columns are highlighted. + *'columns'* *'co'* *E594* 'columns' 'co' number (default 80 or terminal width) global @@ -4601,25 +4620,6 @@ A jump table for the options with a shor < This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - *'colorcolumn'* *'cc'* -'colorcolumn' 'cc' string (default "") - local to window - {not in Vi} - {not available when compiled without the |+syntax| - feature} - 'colorcolumn' is a comma separated list of screen columns that are - highlighted with ColorColumn |hl-ColorColumn|. Useful to align - text. Will make screen redrawing slower. - The screen column can be an absolute number, or a number preceded with - '+' or '-', which is added to or subtracted from 'textwidth'. > - - :set cc=+1 " highlight column after 'textwidth' - :set cc=+1,+2,+3 " highlight three columns after 'textwidth' - :hi ColorColumn ctermbg=lightgrey guibg=lightgrey -< - When 'textwidth' is zero then the items with '-' and '+' are not used. - A maximum of 256 columns are highlighted. - *'matchpairs'* *'mps'* 'matchpairs' 'mps' string (default "(:),{:},[:]") local to buffer
--- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.3. Last change: 2010 Jul 20 +*quickfix.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -546,6 +546,14 @@ descriptors when searching many files. modifier is used the buffers are kept loaded. This makes following searches in the same files a lot faster. +Note that |:copen| (or |:lopen| for |:lgrep|) may be used to open a buffer +containing the search results in linked form. The |:silent| command may be +used to suppress the default full screen grep output. The |:grep!| form of +the |:grep| command doesn't jump to the first match automatically. These +commands can be combined to create a NewGrep command: > + + command! -nargs=+ NewGrep execute 'silent grep! <args>' | copen 42 + 5.1 using Vim's internal grep
--- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.3. Last change: 2010 May 07 +*sign.txt* For Vim version 7.3. Last change: 2010 Oct 14 VIM REFERENCE MANUAL by Gordon Prieur @@ -70,7 +70,8 @@ DEFINING A SIGN. *:sign-define* *E255* :sign define {name} {argument}... Define a new sign or set attributes for an existing sign. The {name} can either be a number (all digits) or a name - starting with a non-digit. + starting with a non-digit. Leading digits are ignored, thus + "0012", "012" and "12" are considered the same name. About 120 different signs can be defined. Accepted arguments:
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2010 Sep 29 +*todo.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,21 +30,9 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -Cursor position wrong when 'formatoptions' contains "a". (Moshe Kamensky, 2010 -Sep 7, Gary Johnson, 2010 Sep 14) -Formatoptions cause cursor to jump. (ZyX, 2010 Aug 22) -Caused by revision 2294, "Make joining a range of lines much faster. (Milan -Vancura)" ? -Patch by Carlo Teubner, 2010 Sep 25. Test Sep 26. - 'cursorline' is displayed too short when there are concealed characters and 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15) -Hang on slave PTY on Mac. Patch from Nikola Knezevic, 2010 Aug 29. - -Patch to fix sign type negative and memory not freed. (Xavier de Gaye, 2010 -Aug 20) - Conceal: using Tab for cchar causes problems. Should reject it. (ZyX, 2010 Aug 25) @@ -52,24 +40,14 @@ Syntax region with 'concealends' and a ' only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug 21, Ben Fritz, 2010 Sep 14) -Patch for :mksession not escaping file name properly. (Peter Odding, 2010 Sep -19) - -Patch for CTRL-] in help file doing wrong escaping. (Carlo Teubner, 2010 Sep -25) - -Patch to support List and Dict in .viminfo. (Christian Brabandt, 2010 Sep 24) -Sep 26 with a test. - -Patch for :grep docs. (Britton Kerin, 2010 Aug 31) - -Patch for dynamic loading Ruby on Unix. (Jon, 2010 Aug 23) -Included, but also need a change to configure. - -Replacement R syntax file. (Jakson A. Aquino, 2010 Sep 29) - Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26) +This line hangs Vim, because of syntax HL: +call append(line, "INFO ....12....18....24....30....36....42....48....54....60....66....72....78%$") + +Patch to add v:windowid. (Christian J. Robinson, 2010 Oct 13, update by Lech +Lorens, Oct 14) + maparg() doesn't return the flags, such as <buffer>, <script>, <silent>. These are needed to save and restore a mapping. Also: the rhs string is not always correct. (Hari Krishna Dara, 2009 Sept 29) @@ -80,6 +58,10 @@ build. (Bill Lam, 2010 Sep 18) Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5) +Using ":break" or something else that stops executing commands inside a +":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct +15) + Patch to fix warning for accessing mediumVersion. (Dominique Pelle, 2010 Aug 18) @@ -87,24 +69,42 @@ Patch for 2html to support 'fileencoding Patch to use 'previewheight' for popup menu. (Benjamin Haskell, 2010 Sep 29) -CTRL-] on help tag |/[\n]| doesn't jump to the right place. (Tony Mechelynck, -2010 Aug 8) - Three patches for undo persistence. (Christian Brabandt, 2010 Sep 4) +ml_get error for using :copen in a custom complete function. (Xavier +Deguillard, 2010 Oct 19) Other way to reproduce it by Lech Lorens, Oct 20. + string() can't parse back "inf" and "nan". Fix documentation or fix code? (ZyX, 2010 Aug 23) +Patch to use "--as-needed" instead of the link.sh functionality. (Kirill A. +Shutemov, 2010 Aug 25) + +Patch to fix complete(). (Kikuchan, 2010 Oct 15) + +Ruby: Patch to load Gem module. Why is this needed? (Yasuhiro Matsumoto, 2010 +Oct 6) + ":command Print echo 'print'" works, but ":Print" doesn't. Builtin Print should be overruled. (Aaron Thoma) Patch by Christian Brabandt, 2010 Sep 5. Comparing recursive structure loops forever. (ZyX, 2010 Aug 22, info from John Beckett Aug 23) +Patch from Christian Brabandt, 2010 Oct 2 + +":drop" does not respect 'autochdir'. (Peter Odding, 2010 Jul 24) +Patch from Benjamin Fritz, 2010 Oct 13. + +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? GTK: drawing a double-width combining character over single-width characters doesn't look right. (Dominique Pelle, 2010 Aug 8) +Using ":call" inside "if 0" does not see that a function returns a Dict and +gives error for "." as string concatenation. (Yasuhiro Matsumoto, 2010 Oct 20) + 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 @@ -115,9 +115,17 @@ clear why it doesn't work. Editing a file with a ^M with 'ff' set to "mac", opening a help file, then the ^M is displayed as ^J sometimes. Getting 'ff' value from wrong window/buffer? +Patch to add 'systemencoding', convert between 'encoding' and this for file +names, shell commands and the like. (Kikuchan, 2010 Oct 14) +Assume the system converts between the actual encoding of the filesystem to +the system encoding (usually utf-8). + Problem producing tags file when hebrew.frx is present. It has a BOM. Results in E670. (Tony Mechelynck, 2010 May 2) +Patch for dynamic loading Ruby on Unix. (Jon, 2010 Aug 23) +Included, but also need a change to configure. + setpos() does not restore cursor position after :normal. (Tyru, 2010 Aug 11) getpos()/setpos() don't include curswant. getpos() could return a fifth @@ -127,13 +135,12 @@ and that it's documented. Messages in message.txt are highlighted as examples. -Win32: Patch to fix slow access over network (David Anderson). Cleaned up by -John Beckett, 2010 Aug 25. - Test 73 fails on MS-Windows when compiled with DJGPP and run twice. How to delete the Xfind directory? Add an rmdir() function, just like we have mkdir(). +":echo "\x85" =~# '[\u0085]'" returns 1 instead of 0. (ZyX, 2010 Oct 3) + 'cindent' not correct when 'list' is set. (Zdravi Korusef, 2010 Apr 15) Windows installer: licence text should not use indent, causes bad word wrap. @@ -156,8 +163,6 @@ Patch: Let rare word highlighting overru Patch to make more characters work in dialogs. (Yankwei Jia, 2010 Aug 4) -":drop" does not respect 'autochdir'. (Peter Odding, 2010 Jul 24) - When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines instead of one. (Constantin Pan, 2010 Sep 10) @@ -196,6 +201,8 @@ Shell not recognized properly if it ends Find tail? Might have a / in argument. Find space? Might have space in path. +":sort n" treats empty line as higher than zero. (Beeyawned, 2010 Oct 13) + ":function f(x) keepjumps" creates a function where every command is executed like it has ":keepjumps" before it. @@ -364,6 +371,10 @@ perhaps. And undo CTRL-W. CTRL-G l wou Diff mode out of sync. (Gary Johnson, 2010 Aug 4) +Support a 'systemencoding' option (for Unix). It specifies the encoding of +file names. (Kikuchan, 2010 Oct 5). Useful on a latin1 or double-byte Asian +system when 'encoding' is "utf-8". + Win32: A --remote command that has a directory name starting with a ( doesn't work, the backslash is removed, assuming that it escapes the (. (Valery Kondakoff, 2009 May 13)
--- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.3. Last change: 2010 Aug 15 +*version7.txt* For Vim version 7.3. Last change: 2010 Oct 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -8180,7 +8180,7 @@ Solution: Use get_cmdline_type(). (Jam Files: src/ex_getln.c Patch 7.2.130 -Problem: Vim may haing until CTRL-C is typed when using CTRL-Z. +Problem: Vim may hang until CTRL-C is typed when using CTRL-Z. Solution: Avoid using pause(). Also use "volatile" for variables used in signal functions. (Dominique Pelle) Files: src/auto/configure, src/configure.in, src/config.h.in,
--- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.3. Last change: 2010 Sep 25 +*vi_diff.txt* For Vim version 7.3. Last change: 2010 Oct 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -989,6 +989,8 @@ These are remarks about running the POSI - vi test 33 sometimes fails for unknown reasons - vi test 250 fails; behavior will be changed in a new revision http://www.opengroup.org/austin/mailarchives/ag-review/msg01710.html + (link no longer works, perhaps it's now: + https://www.opengroup.org/sophocles/show_mail.tpl?CALLER=show_archive.tpl&source=L&listname=austin-review-l&id=1711) - vi test 310 fails; exit code non-zero when any error occurred? - ex test 24 fails because test is wrong. Changed between SUSv2 and SUSv3. - ex tests 47, 48, 49, 72, 73 fail because .exrc file isn't read in silent
--- a/runtime/ftplugin/changelog.vim +++ b/runtime/ftplugin/changelog.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: generic Changelog file " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2009-05-25 +" Latest Revision: 2010-08-17 " Variables: " g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) - " description: the timeformat used in ChangeLog entries. @@ -170,7 +170,7 @@ if &filetype == 'changelog' endfunction " Internal function to create a new entry in the ChangeLog. - function! s:new_changelog_entry() + function! s:new_changelog_entry(...) " Deal with 'paste' option. let save_paste = &paste let &paste = 1
new file mode 100644 --- /dev/null +++ b/runtime/ftplugin/docbk.vim @@ -0,0 +1,22 @@ +" Vim filetype plugin file +" Language: DocBook +" Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2010-10-14 + +if exists('b:did_ftplugin') + finish +endif + +if !exists('b:docbk_type') + if expand('%:e') == 'sgml' + let b:docbk_type = 'sgml' + else + let b:docbk_type = 'xml' + endif +endif + +if b:docbk_type == 'sgml' + runtime! ftplugin/sgml.vim ftplugin/sgml_*.vim ftplugin/sgml/*.vim +else + runtime! ftplugin/xml.vim ftplugin/xml_*.vim ftplugin/xml/*.vim +endif
--- a/runtime/syntax/gpg.vim +++ b/runtime/syntax/gpg.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: gpg(1) configuration file " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2007-06-17 +" Latest Revision: 2010-10-14 if exists("b:current_syntax") finish @@ -54,7 +54,7 @@ syn keyword gpgOption contained skipwh \ personal-digest-preferences photo-viewer \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode \ secret-keyring set-filename set-policy-url status-fd - \ trusted-key verify-options + \ trusted-key verify-options keyid-format list-options syn keyword gpgOption contained skipwhite nextgroup=gpgArgError \ allow-freeform-uid allow-non-selfsigned-uid \ allow-secret-key-import always-trust
--- a/runtime/syntax/r.vim +++ b/runtime/syntax/r.vim @@ -1,111 +1,137 @@ " Vim syntax file -" Language: R (GNU S) -" Maintainer: Vaidotas Zemlys <zemlys@gmail.com> -" Last Change: 2006 Apr 30 -" Filenames: *.R *.Rout *.r *.Rhistory *.Rt *.Rout.save *.Rout.fail -" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/r.vim +" Language: R (GNU S) +" Maintainer: Jakson Aquino <jalvesaq@gmail.com> +" Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com> +" Tom Payne <tom@tompayne.org> +" Last Change: Wed Sep 29, 2010 09:31AM +" Filenames: *.R *.r *.Rhistory *.Rt +" +" NOTE: The highlighting of R functions is defined in the +" r-plugin/functions.vim, which is part of vim-r-plugin2: +" http://www.vim.org/scripts/script.php?script_id=2628 +" +" Some lines of code were borrowed from Zhuojun Chen. -" First maintainer Tom Payne <tom@tompayne.org> -" Modified to make syntax less colourful and added the highlighting of -" R assignment arrow - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +if exists("b:current_syntax") finish endif -if version >= 600 - setlocal iskeyword=@,48-57,_,. -else - set iskeyword=@,48-57,_,. -endif +setlocal iskeyword=@,48-57,_,. syn case match " Comment -syn match rComment /\#.*/ +syn match rComment contains=@Spell "\#.*" -" Constant " string enclosed in double quotes -syn region rString start=/"/ skip=/\\\\\|\\"/ end=/"/ +syn region rString contains=rSpecial,rStrError,@Spell start=/"/ skip=/\\\\\|\\"/ end=/"/ " string enclosed in single quotes -syn region rString start=/'/ skip=/\\\\\|\\'/ end=/'/ -" number with no fractional part or exponent -syn match rNumber /\d\+/ -" floating point number with integer and fractional parts and optional exponent -syn match rFloat /\d\+\.\d*\([Ee][-+]\=\d\+\)\=/ -" floating point number with no integer part and optional exponent -syn match rFloat /\.\d\+\([Ee][-+]\=\d\+\)\=/ -" floating point number with no fractional part and optional exponent -syn match rFloat /\d\+[Ee][-+]\=\d\+/ +syn region rString contains=rSpecial,rStrError,@Spell start=/'/ skip=/\\\\\|\\'/ end=/'/ + +syn match rStrError display contained "\\." + +" New line, carriage return, tab, backspace, bell, feed, vertical tab, backslash +syn match rSpecial display contained "\\\(n\|r\|t\|b\|a\|f\|v\|'\|\"\)\|\\\\" -" Identifier -" identifier with leading letter and optional following keyword characters -syn match rIdentifier /\a\k*/ -" identifier with leading period, one or more digits, and at least one non-digit keyword character -syn match rIdentifier /\.\d*\K\k*/ +" Hexadecimal and Octal digits +syn match rSpecial display contained "\\\(x\x\{1,2}\|[0-8]\{1,3}\)" + +" Unicode characters +syn match rSpecial display contained "\\u\x\{1,4}" +syn match rSpecial display contained "\\U\x\{1,8}" +syn match rSpecial display contained "\\u{\x\{1,4}}" +syn match rSpecial display contained "\\U{\x\{1,8}}" + + +syn match rDollar "\$" " Statement syn keyword rStatement break next return syn keyword rConditional if else syn keyword rRepeat for in repeat while +" Constant (not really) +syn keyword rConstant T F LETTERS letters month.ab month.name pi +syn keyword rConstant R.version.string + " Constant -syn keyword rConstant LETTERS letters month.ab month.name pi syn keyword rConstant NULL syn keyword rBoolean FALSE TRUE -syn keyword rNumber NA -syn match rArrow /<\{1,2}-/ +syn keyword rNumber NA NA_integer_ NA_real_ NA_complex_ NA_character_ +syn keyword rNumber Inf NaN + +" integer +syn match rInteger "\<\d\+L" +syn match rInteger "\<0x\([0-9]\|[a-f]\|[A-F]\)\+L" +syn match rInteger "\<\d\+[Ee]+\=\d\+L" + +syn match rOperator "[\*\!\&\+\-\<\>\=\^\|\~\`/:@]" +syn match rOperator "%\{2}\|%\*%\|%\/%\|%in%\|%o%\|%x%" -" Type -syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame +syn match rComplex "\<\d\+i" +syn match rComplex "\<0x\([0-9]\|[a-f]\|[A-F]\)\+i" +syn match rComplex "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\=i" +syn match rComplex "\<\.\d\+\([Ee][-+]\=\d\+\)\=i" +syn match rComplex "\<\d\+[Ee][-+]\=\d\+i" + +" number with no fractional part or exponent +syn match rNumber "\<\d\+\>" +" hexadecimal number +syn match rNumber "\<0x\([0-9]\|[a-f]\|[A-F]\)\+" + +" floating point number with integer and fractional parts and optional exponent +syn match rFloat "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\=" +" floating point number with no integer part and optional exponent +syn match rFloat "\<\.\d\+\([Ee][-+]\=\d\+\)\=" +" floating point number with no fractional part and optional exponent +syn match rFloat "\<\d\+[Ee][-+]\=\d\+" + +syn match rArrow "<\{1,2}-" +syn match rArrow "->\{1,2}" " Special -syn match rDelimiter /[,;:]/ +syn match rDelimiter "[,;:]" " Error syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError -syn match rError /[)\]}]/ -syn match rBraceError /[)}]/ contained -syn match rCurlyError /[)\]]/ contained -syn match rParenError /[\]}]/ contained +syn match rError "[)\]}]" +syn match rBraceError "[)}]" contained +syn match rCurlyError "[)\]]" contained +syn match rParenError "[\]}]" contained + +" Functions that may add new objects +syn keyword rPreProc library require attach detach source + +" Type +syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_r_syn_inits") - if version < 508 - let did_r_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - HiLink rComment Comment - HiLink rConstant Constant - HiLink rString String - HiLink rNumber Number - HiLink rBoolean Boolean - HiLink rFloat Float - HiLink rStatement Statement - HiLink rConditional Conditional - HiLink rRepeat Repeat - HiLink rIdentifier Normal - HiLink rArrow Statement - HiLink rType Type - HiLink rDelimiter Delimiter - HiLink rError Error - HiLink rBraceError Error - HiLink rCurlyError Error - HiLink rParenError Error - delcommand HiLink -endif +hi def link rArrow Statement +hi def link rBoolean Boolean +hi def link rBraceError Error +hi def link rComment Comment +hi def link rComplex Number +hi def link rConditional Conditional +hi def link rConstant Constant +hi def link rCurlyError Error +hi def link rDelimiter Delimiter +hi def link rDollar SpecialChar +hi def link rError Error +hi def link rFloat Float +hi def link rInteger Number +hi def link rNumber Number +hi def link rOperator Operator +hi def link rParenError Error +hi def link rPreProc PreProc +hi def link rRepeat Repeat +hi def link rSpecial SpecialChar +hi def link rStatement Statement +hi def link rString String +hi def link rStrError Error +hi def link rType Type let b:current_syntax="r" " vim: ts=8 sw=2 -
--- a/runtime/syntax/yaml.vim +++ b/runtime/syntax/yaml.vim @@ -2,7 +2,7 @@ " Language: YAML (YAML Ain't Markup Language) 1.2 " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> " First author: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2010-09-16 +" Latest Revision: 2010-10-08 if exists('b:current_syntax') finish @@ -124,7 +124,7 @@ syn match yamlConstant '\<\~\>' syn match yamlTimestamp /\%([\[\]{}, \t]\@!\p\)\@<!\%(\d\{4}-\d\d\=-\d\d\=\%(\%([Tt]\|\s\+\)\%(\d\d\=\):\%(\d\d\):\%(\d\d\)\%(\.\%(\d*\)\)\=\%(\s*\%(Z\|[+-]\d\d\=\%(:\d\d\)\=\)\)\=\)\=\)\%([\[\]{}, \t]\@!\p\)\@!/ -syn match yamlInteger /\%([\[\]{}, \t]\@!\p\)\@<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\)\%([\[\]{}, \t]\@!\p\)\@!/ +syn match yamlInteger /\%([\[\]{}, \t]\@!\p\)\@<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)\%([\[\]{}, \t]\@!\p\)\@!/ syn match yamlFloat /\%([\[\]{}, \t]\@!\p\)\@<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\d\+\)\=\|\.[0-9_]\+\%([eE][-+][0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)\%([\[\]{}, \t]\@!\p\)\@!/ execute 'syn match yamlNodeTag '.string(s:c_ns_tag_property)