From 5dc6252d331013e397a8d71e8f7ee9fd1cf514c1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 13 Feb 2012 00:05:22 +0100 Subject: Update runtime files. --- runtime/doc/autocmd.txt | 4 +- runtime/doc/cmdline.txt | 4 +- runtime/doc/debug.txt | 4 +- runtime/doc/options.txt | 8 +- runtime/doc/syntax.txt | 21 ++--- runtime/doc/tags | 2 + runtime/doc/todo.txt | 64 +++------------ runtime/filetype.vim | 4 +- runtime/ftplugin/erlang.vim | 144 ++++++++------------------------ runtime/syntax/bzr.vim | 8 +- runtime/syntax/lua.vim | 7 +- runtime/syntax/msidl.vim | 7 +- runtime/syntax/nasm.vim | 15 ++-- runtime/syntax/natural.vim | 12 ++- runtime/syntax/rcs.vim | 8 +- runtime/syntax/scheme.vim | 20 +++-- runtime/syntax/sisu.vim | 194 +++++++++++++++++++++++++++++--------------- runtime/syntax/st.vim | 8 +- runtime/syntax/svn.vim | 8 +- runtime/syntax/synload.vim | 4 +- 20 files changed, 261 insertions(+), 285 deletions(-) (limited to 'runtime') diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 8e1e94ba23..8f50eb82a2 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.3. Last change: 2012 Jan 20 +*autocmd.txt* For Vim version 7.3. Last change: 2012 Feb 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1053,7 +1053,7 @@ Note that the 'eventignore' option applies here too. Events listed in this option will not cause any commands to be executed. *:do* *:doau* *:doautocmd* *E217* -:do[autocmd] [group] {event} [fname] +:do[autocmd] [] [group] {event} [fname] Apply the autocommands matching [fname] (default: current file name) for {event} to the current buffer. You can use this when the current file name does not diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 12cebb2d91..6aec69ec93 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.3. Last change: 2011 Mar 27 +*cmdline.txt* For Vim version 7.3. Last change: 2012 Feb 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -426,6 +426,8 @@ a previous version was used). In the pattern standard wildcards '*' and '?' are accepted when matching file names. '*' matches any string, '?' matches exactly one character. +The 'wildignorecase' option can be set to ignore case in filenames. + If you like tcsh's autolist completion, you can use this mapping: :cnoremap X (Where X is the command key to use, is CTRL-L and is CTRL-D) diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 12b0bb1828..0b55c34c43 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.3. Last change: 2010 Dec 22 +*debug.txt* For Vim version 7.3. Last change: 2012 Feb 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -15,7 +15,7 @@ For debugging Vim scripts, functions, etc. see |debug-scripts| ============================================================================== -1. Location of a crash, using gcc and gdb *debug-gcc* +1. Location of a crash, using gcc and gdb *debug-gcc* *gdb* When Vim crashes in one of the test files, and you are using gcc for compilation, here is what you can do to find out exactly where Vim crashes. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ff233acb83..0616857bed 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2012 Jan 13 +*options.txt* For Vim version 7.3. Last change: 2012 Feb 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5899,8 +5899,10 @@ A jump table for the options with a short description can be found at |Q_op|. security reasons. *'shellcmdflag'* *'shcf'* -'shellcmdflag' 'shcf' string (default: "-c", MS-DOS and Win32, when 'shell' - does not contain "sh" somewhere: "/c") +'shellcmdflag' 'shcf' string (default: "-c"; + Win32, when 'shell' is cmd.exe: "/s /c"; + MS-DOS and Win32, when 'shell' neither is + cmd.exe nor contains "sh" somewhere: "/c") global {not in Vi} Flag passed to the shell to execute "!" and ":!" commands; e.g., diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index fa032fc09f..e480968f90 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3. Last change: 2012 Jan 20 +*syntax.txt* For Vim version 7.3. Last change: 2012 Feb 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -986,9 +986,9 @@ Example: > or > // vim:syntax=c.doxygen -It can also be done automatically for C, C++, C# and IDL files by setting the -global or buffer-local variable load_doxygen_syntax. This is done by adding -the following to your .vimrc. > +It can also be done automatically for C, C++, C#, IDL and PHP files by setting +the global or buffer-local variable load_doxygen_syntax. This is done by +adding the following to your .vimrc. > :let g:load_doxygen_syntax=1 There are a couple of variables that have an effect on syntax highlighting, and @@ -1742,19 +1742,10 @@ instead, and the name of your source file should be *.pike LUA *lua.vim* *ft-lua-syntax* -This syntax file may be used for Lua 4.0, Lua 5.0 or Lua 5.1 (the latter is +The Lua syntax file can be used for versions 4.0, 5.0, 5.1 and 5.2 (5.2 is the default). You can select one of these versions using the global variables lua_version and lua_subversion. For example, to activate Lua -4.0 syntax highlighting, use this command: > - - :let lua_version = 4 - -If you are using Lua 5.0, use these commands: > - - :let lua_version = 5 - :let lua_subversion = 0 - -To restore highlighting for Lua 5.1: > +5.1 syntax highlighting, set the variables like this: :let lua_version = 5 :let lua_subversion = 1 diff --git a/runtime/doc/tags b/runtime/doc/tags index 53f4caa8d1..ab2bf3ebfb 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3206,6 +3206,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* map.txt /** map.txt /** intro.txt /** + autocmd.txt /** map.txt /** map.txt /** map.txt /** @@ -5948,6 +5949,7 @@ g`a motion.txt /*g`a* ga various.txt /*ga* garbagecollect() eval.txt /*garbagecollect()* gd pattern.txt /*gd* +gdb debug.txt /*gdb* ge motion.txt /*ge* get() eval.txt /*get()* get-ms-debuggers debug.txt /*get-ms-debuggers* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index c108ceef29..925efb6358 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2012 Feb 04 +*todo.txt* For Vim version 7.3. Last change: 2012 Feb 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -41,61 +41,13 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) Once syntax and other runtime files have been fixed: add "set cp" to check.vim. Use a function to run both with 'cp' and 'nocp'. -Repeating search history entries. (Edwin Steiner, 2012 Jan 17) -Jan 18: Caused by patch 7.3.265? - -Patch for '$' not being displayed for a change when 'cpoptions' contains "$". -(Yasuhiro Matsumoto, 2012 Jan 28, patch by Hideki EIRAKU and Hirohito Higashi) - -Patch to speed up readfile(). (John Little, 2012 Feb 1) -Adjustment by Charles Peacech, Feb 3. -8 When editing a file with extremely long lines (e.g., an executable), the - "linerest" in readfile() is allocated twice to be able to copy what was - read so far. Use realloc() instead? Or split the line when allocating - memory fails and "linerest" is big (> 100000)? - -Patch to fix a crash when an xpm file is invalid. (Dave Bodenstab, 2012 Jan -27) - -Hang in using VimEnter. (Alex Efros, 2012 Jan 14) - -Patch for behavior of "." in compatible mode. (Yasuhiro Matsumoto, patch by -Hideki EIRAKU, 2012 Jan 28) - -":cd" doesn't work when current directory path contains wildcards. -finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10) +GTK: problem with 'L' in 'guioptions' changing the window width. +(Aaron Cornelius, 2012 Feb 6) Win32: When a directory name contains an exclamation mark, completion doesn't complete the contents of the directory. No escaping for the "!"? (Jan Stocker, 2012 Jan 5) -Patch to add support for Solaris ZFS ACLs. (Danek Duvall, 2012 Jan 13) - -Patch to make continued lines work faster. (Yasuhiro Matsumoto, 2012 Jan 11) - -Also an idea to make join() faster. (Yasuhiro Matsumoto, 2012 Jan 11) -Another one from Taro Muraoka, 2012 Jan 12. - -":doau" says it triggers modeline. Should this only happen for events used -when loading a buffer? (Kana Natsuno, 2011 Nov 7) - -Patch for compiler warnings in if_perl. (James McCoy, 2011 Jan 30) - -Patch for X selection conversion. (Alex Efros, 2012 Jan 24) - -Patch to make 'shcf' default work better. (Benjamin Fritz, 2011 Nov 18) - Win32: When 'shell' is cmd.exe this command fails: - echo system('"c:/path/echo.exe" "foo bar"') - Should we set the default for 'shellxquote' to a double quote, when 'shell' - contains "cmd" in the tail? (Benjamin Fritz, 2008 Oct 13) - Also set 'shellcmdflag' to include /s. - -Other way to start Mzscheme. Tim Brown, 2011 Oct 5: change main call. -Later patch by Sergey Khorev, 2011 Oct 9. - -Patch to allow ! for :all and :sall, as documented. (Hirohito Higashi, 2012 -Jan 30) - Patch for "tab drop hoge" moving current window. (Higashi, 2012 Jan 31) ":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an open window. (Herb Sitz, 2011 Nov 17) @@ -153,6 +105,8 @@ Patch for using objcpp file type for headers files. Issue 44. Docs fix for v:register. (Ingo Karkat, 2011 Sep 26, 27) v:register doesn't work exactly as expected. (David Fishburn, 2011 Sep 20) +Patch for: vimgrep fails when 'autochdir' is set. (Ben Fritz, 2012 Feb 4) + Patch for: (Christian Brabandt, 2011 Aug 22) - Make it possible to enter "r" and "r" (get character from line below/above). @@ -177,6 +131,10 @@ Patch Sep 18. Patch for has('unnamedplus') docs. (Tony Mechelynck, 2011 Sep 27) And one for gui_x11.txt. +":cd" doesn't work when current directory path contains "**". +finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10) +Requires a rewrite of the file_file_in_path code. + Problem with l: dictionary being locked in a function. (ZyX, 2011 Jul 21) Issue 48: foldopen error can't be caught by try/catch @@ -184,6 +142,8 @@ Issue 48: foldopen error can't be caught by try/catch Patch to sort functions starting with '<' after others. Omit dict functions, they can't be called. (Yasuhiro Matsumoto, 2011 Oct 11) +Patch to pass list to or(), and() and xor(). (Yasuhiro Matsumoto, 2012 Feb 8) + Patch to improve "it" and "at" text object matching. (Christian Brabandt, 2011 Nov 20) @@ -628,6 +588,8 @@ Win32: Expanding 'path' runs into a maximum size limit. (bgold12, 2009 Nov 15) Win32: Patch for enabling quick edit mode in console. (Craig Barkhouse, 2010 Sep 1) +Win32: Patch for using .png files for icons. (Charles Peacech, 2012 Feb 5) + Putting a Visual block while 'visualedit' is "all" does not leave the cursor on the first character. (John Beckett, 2010 Aug 7) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a3ae34a4dd..6f8e2c69d6 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2012 Feb 03 +" Last Change: 2012 Feb 05 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -2546,7 +2546,7 @@ au BufNewFile,BufRead *.txt,*.text setf text runtime! ftdetect/*.vim " NOTE: The above command could have ended the filetypedetect autocmd group -" and started another one. Let's make sure it has ended to get to a consistant +" and started another one. Let's make sure it has ended to get to a consistent " state. augroup END diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim index 4899020f85..af4e910b25 100644 --- a/runtime/ftplugin/erlang.vim +++ b/runtime/ftplugin/erlang.vim @@ -1,10 +1,10 @@ " Vim ftplugin file " Language: Erlang -" Author: Oscar Hellström -" Contributors: Ricardo Catalinas Jiménez +" Author: Oscar Hellström +" Contributors: Ricardo Catalinas Jiménez " Eduardo Lopez (http://github.com/tapichu) " License: Vim license -" Version: 2011/11/21 +" Version: 2012/01/25 if exists('b:did_ftplugin') finish @@ -27,13 +27,10 @@ if !exists('g:erlang_folding') let g:erlang_folding = 0 endif -" Local settings -function s:SetErlangOptions() - compiler erlang - if version >= 700 - setlocal omnifunc=erlang_complete#Complete - endif +let s:erlang_fun_begin = '^\a\w*(.*$' +let s:erlang_fun_end = '^[^%]*\.\s*\(%.*\)\?$' +function s:SetErlangOptions() if g:erlang_folding setlocal foldmethod=expr setlocal foldexpr=GetErlangFold(v:lnum) @@ -47,104 +44,35 @@ function s:SetErlangOptions() let &l:keywordprg = g:erlang_keywordprg endfunction -" Define folding functions -if !exists('*GetErlangFold') - " Folding params - let s:erlang_fun_begin = '^\a\w*(.*$' - let s:erlang_fun_end = '^[^%]*\.\s*\(%.*\)\?$' - let s:erlang_blank_line = '^\s*\(%.*\)\?$' - - " Auxiliary fold functions - function s:GetNextNonBlank(lnum) - let lnum = nextnonblank(a:lnum + 1) - let line = getline(lnum) - while line =~ s:erlang_blank_line && 0 != lnum - let lnum = nextnonblank(lnum + 1) - let line = getline(lnum) - endwhile - return lnum - endfunction - - function s:GetFunName(str) - return matchstr(a:str, '^\a\w*(\@=') - endfunction - - function s:GetFunArgs(str, lnum) - let str = a:str - let lnum = a:lnum - while str !~ '->\s*\(%.*\)\?$' - let lnum = s:GetNextNonBlank(lnum) - if 0 == lnum " EOF - return '' - endif - let str .= getline(lnum) - endwhile - return matchstr(str, - \ '\(^(\s*\)\@<=.*\(\s*)\(\s\+when\s\+.*\)\?\s\+->\s*\(%.*\)\?$\)\@=') - endfunction - - function s:CountFunArgs(arguments) - let pos = 0 - let ac = 0 " arg count - let arguments = a:arguments - - " Change list / tuples into just one A(rgument) - let erlang_tuple = '{\([A-Za-z_,|=\-\[\]]\|\s\)*}' - let erlang_list = '\[\([A-Za-z_,|=\-{}]\|\s\)*\]' - - " FIXME: Use searchpair? - while arguments =~ erlang_tuple - let arguments = substitute(arguments, erlang_tuple, 'A', 'g') - endwhile - " FIXME: Use searchpair? - while arguments =~ erlang_list - let arguments = substitute(arguments, erlang_list, 'A', 'g') - endwhile - - let len = strlen(arguments) - while pos < len && pos > -1 - let ac += 1 - let pos = matchend(arguments, ',\s*', pos) - endwhile - return ac - endfunction - - " Main fold function - function GetErlangFold(lnum) - let lnum = a:lnum - let line = getline(lnum) - - if line =~ s:erlang_fun_end - return '<1' - endif - - if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1 - return '1' - endif - - if line =~ s:erlang_fun_begin - return '>1' - endif - - return '=' - endfunction - - " Erlang fold description (foldtext function) - function ErlangFoldText() - let foldlen = v:foldend - v:foldstart - if 1 < foldlen - let lines = 'lines' - else - let lines = 'line' - endif - let line = getline(v:foldstart) - let name = s:GetFunName(line) - let arguments = s:GetFunArgs(strpart(line, strlen(name)), v:foldstart) - let argcount = s:CountFunArgs(arguments) - let retval = '+' . v:folddashes . ' ' . name . '/' . argcount - let retval .= ' (' . foldlen . ' ' . lines . ')' - return retval - endfunction -endif +function GetErlangFold(lnum) + let lnum = a:lnum + let line = getline(lnum) + + if line =~ s:erlang_fun_end + return '<1' + endif + + if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1 + return '1' + endif + + if line =~ s:erlang_fun_begin + return '>1' + endif + + return '=' +endfunction + +function ErlangFoldText() + let line = getline(v:foldstart) + let foldlen = v:foldend - v:foldstart + 1 + let lines = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '') + if foldlen < 10 + let lines = ' ' . lines + endif + let retval = '+' . v:folddashes . lines + + return retval +endfunction call s:SetErlangOptions() diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim index 82ab1d8749..ef5445bf45 100644 --- a/runtime/syntax/bzr.vim +++ b/runtime/syntax/bzr.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: Bazaar (bzr) commit file -" Maintainer: Dmitry Vasiliev -" URL: http://www.hlabs.spb.ru/vim/bzr.vim -" Last Change: 2009-01-27 +" Maintainer: Dmitry Vasiliev +" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/bzr.vim +" Last Change: 2012-02-11 " Filenames: bzr_log.* -" Version: 1.2.1 +" Version: 1.2.2 " " Thanks: " diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim index 18e97ff534..2952ad962a 100644 --- a/runtime/syntax/lua.vim +++ b/runtime/syntax/lua.vim @@ -2,7 +2,7 @@ " Language: Lua 4.0, Lua 5.0, Lua 5.1 and Lua 5.2 " Maintainer: Marcus Aurelius Farias " First Author: Carlos Augusto Teixeira Mendes -" Last Change: 2011 Dec 20 +" Last Change: 2012 Feb 07 " Options: lua_version = 4 or 5 " lua_subversion = 0 (4.0, 5.0) or 1 (5.1) or 2 (5.2) " default 5.2 @@ -15,6 +15,9 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + if !exists("lua_version") " Default is lua 5.2 let lua_version = 5 @@ -358,4 +361,6 @@ endif let b:current_syntax = "lua" +let &cpo = s:cpo_save +unlet s:cpo_save " vim: et ts=8 sw=2 diff --git a/runtime/syntax/msidl.vim b/runtime/syntax/msidl.vim index cf270eebd7..79585bebc6 100644 --- a/runtime/syntax/msidl.vim +++ b/runtime/syntax/msidl.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: MS IDL (Microsoft dialect of Interface Description Language) " Maintainer: Vadim Zeitlin -" Last Change: 2003 May 11 +" Last Change: 2012 Feb 12 by Thilo Six " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -11,6 +11,9 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + " Misc basic syn match msidlId "[a-zA-Z][a-zA-Z0-9_]*" syn match msidlUUID "{\?[[:xdigit:]]\{8}-\([[:xdigit:]]\{4}-\)\{3}[[:xdigit:]]\{12}}\?" @@ -89,4 +92,6 @@ endif let b:current_syntax = "msidl" +let &cpo = s:cpo_save +unlet s:cpo_save " vi: set ts=8 sw=4: diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim index 50cbe1ca03..a6ed056650 100644 --- a/runtime/syntax/nasm.vim +++ b/runtime/syntax/nasm.vim @@ -3,7 +3,7 @@ " Maintainer: Andriy Sokolov " Original Author: Manuel M.H. Stol " Former Maintainer: Manuel M.H. Stol -" Last Change: 2010 Sep 24 +" Last Change: 2012 Feb 7 " NASM Home: http://www.nasm.us/ @@ -48,14 +48,14 @@ syn cluster nasmGrpComments contains=@nasmGrpInComments,nasmComment,nasmSpecialC " in NASM: 'Everything is a Label' " Definition Label = label defined by %[i]define or %[i]assign " Identifier Label = label defined as first non-keyword on a line or %[i]macro -syn match nasmLabelError "$\=\(\d\+\K\|[#\.@]\|\$\$\k\)\k*\>" +syn match nasmLabelError "$\=\(\d\+\K\|[#.@]\|\$\$\k\)\k*\>" syn match nasmLabel "\<\(\h\|[?@]\)\k*\>" syn match nasmLabel "[\$\~]\(\h\|[?@]\)\k*\>"lc=1 " Labels starting with one or two '.' are special syn match nasmLocalLabel "\<\.\(\w\|[#$?@~]\)\k*\>" syn match nasmLocalLabel "\<\$\.\(\w\|[#$?@~]\)\k*\>"ms=s+1 if !exists("nasm_no_warn") - syn match nasmLabelWarn "\<\~\=\$\=[_\.][_\.\~]*\>" + syn match nasmLabelWarn "\<\~\=\$\=[_.][_.\~]*\>" endif if exists("nasm_loose_syntax") syn match nasmSpecialLabel "\<\.\.@\k\+\>" @@ -92,7 +92,6 @@ syn keyword nasmFltNumber Inf Infinity Indefinite NaN SNaN QNaN syn match nasmNumberError "\<\~\s*\d\+\.\d*\(e[+-]\=\d\+\)\=\>" - " Netwide Assembler Storage Directives: " Storage types syn keyword nasmTypeError DF EXTRN FWORD RESF TBYTE @@ -181,7 +180,7 @@ if exists("nasm_ctx_outside_macro") syn region nasmPreConditDef transparent matchgroup=nasmCtxPreCondit start="^\s*%ifnctx\>"hs=e-6 start="^\s*%ifctx\>"hs=e-5 end="%endif\>" contains=@nasmGrpCntnPreCon syn match nasmCtxPreProc "^\s*%pop\>"hs=e-3 if exists("nasm_loose_syntax") - syn match nasmCtxLocLabel "%$\+\(\w\|[#\.?@~]\)\k*\>" + syn match nasmCtxLocLabel "%$\+\(\w\|[#.?@~]\)\k*\>" else syn match nasmCtxLocLabel "%$\+\(\h\|[?@]\)\k*\>" endif @@ -249,10 +248,10 @@ syn match nasmRegisterError "\" syn match nasmRegisterError "\\)" syn match nasmRegisterError "\" " Memory reference operand (address): -syn match nasmMemRefError "[\[\]]" +syn match nasmMemRefError "[[\]]" syn cluster nasmGrpCntnMemRef contains=ALLBUT,@nasmGrpComments,@nasmGrpPreProcs,@nasmGrpInStrucs,nasmMemReference,nasmMemRefError -syn match nasmInMacMemRef contained "\[[^;\[\]]\{-}\]" contains=@nasmGrpCntnMemRef,nasmPreProcError,nasmInMacLabel,nasmInMacLblWarn,nasmInMacParam -syn match nasmMemReference "\[[^;\[\]]\{-}\]" contains=@nasmGrpCntnMemRef,nasmPreProcError,nasmCtxLocLabel +syn match nasmInMacMemRef contained "\[[^;[\]]\{-}\]" contains=@nasmGrpCntnMemRef,nasmPreProcError,nasmInMacLabel,nasmInMacLblWarn,nasmInMacParam +syn match nasmMemReference "\[[^;[\]]\{-}\]" contains=@nasmGrpCntnMemRef,nasmPreProcError,nasmCtxLocLabel diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim index 2628151378..4fbc916be2 100644 --- a/runtime/syntax/natural.vim +++ b/runtime/syntax/natural.vim @@ -1,9 +1,9 @@ " Vim syntax file " " Language: NATURAL -" Version: 2.1.0.3 +" Version: 2.1.0.5 " Maintainer: Marko von Oppen -" Last Changed: 2008-07-29 01:40:52 +" Last Changed: 2012-02-05 18:50:43 " Support: http://www.von-oppen.com/ " For version 5.x: Clear all syntax items @@ -17,6 +17,9 @@ else setlocal iskeyword+=-,*,#,+,_,/ endif +let s:cpo_save = &cpo +set cpo&vim + " NATURAL is case insensitive syntax case ignore @@ -206,4 +209,7 @@ endif let b:current_syntax = "natural" -" vim:set ts=8 sw=8 noet ft=vim: +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim:set ts=8 sw=8 noet ft=vim list: diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim index 04a2cce9b6..e45d5fdbb6 100644 --- a/runtime/syntax/rcs.vim +++ b/runtime/syntax/rcs.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: RCS file -" Maintainer: Dmitry Vasiliev -" URL: http://www.hlabs.spb.ru/vim/rcs.vim -" Revision: $Id: rcs.vim,v 1.2 2006/03/27 16:41:00 vimboss Exp $ +" Maintainer: Dmitry Vasiliev +" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/rcs.vim +" Last Change: 2012-02-11 " Filenames: *,v -" Version: 1.11 +" Version: 1.12 " Options: " rcs_folding = 1 For folding strings diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim index f98703446e..0adaaa50e8 100644 --- a/runtime/syntax/scheme.vim +++ b/runtime/syntax/scheme.vim @@ -1,13 +1,13 @@ " Vim syntax file " Language: Scheme (R5RS + some R6RS extras) -" Last Change: 2009 Nov 27 +" Last Change: 2012 Feb 04 " Maintainer: Sergey Khorev " Original author: Dirk van Deun " This script incorrectly recognizes some junk input as numerals: " parsing the complete system of Scheme numerals using the pattern " language is practically impossible: I did a lax approximation. - + " MzScheme extensions can be activated with setting is_mzscheme variable " Suggestions and bug reports are solicited by the author. @@ -22,6 +22,9 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + syn case ignore " Fascist highlighting: everything that doesn't fit the rules is an error... @@ -117,7 +120,7 @@ syn keyword schemeFunc hashtable? hashtable-size hashtable-ref hashtable-set! syn keyword schemeFunc hashtable-delete! hashtable-contains? hashtable-update! syn keyword schemeFunc hashtable-copy hashtable-clear! hashtable-keys syn keyword schemeFunc hashtable-entries hashtable-equivalence-function hashtable-hash-function -syn keyword schemeFunc hashtable-mutable? equal-hash string-hash string-ci-hash symbol-hash +syn keyword schemeFunc hashtable-mutable? equal-hash string-hash string-ci-hash symbol-hash syn keyword schemeFunc find for-all exists filter partition fold-left fold-right syn keyword schemeFunc remp remove remv remq memp assp cons* @@ -207,7 +210,7 @@ if exists("b:is_mzscheme") || exists("is_mzscheme") syn keyword schemeExtSyntax free-identifier=? bound-identifier=? module-identifier=? syntax-object->datum syn keyword schemeExtSyntax datum->syntax-object syn keyword schemeExtSyntax let-values let*-values letrec-values set!-values fluid-let parameterize begin0 - syn keyword schemeExtSyntax error raise opt-lambda define-values unit unit/sig define-signature + syn keyword schemeExtSyntax error raise opt-lambda define-values unit unit/sig define-signature syn keyword schemeExtSyntax invoke-unit/sig define-values/invoke-unit/sig compound-unit/sig import export syn keyword schemeExtSyntax link syntax quasisyntax unsyntax with-syntax @@ -231,7 +234,7 @@ if exists("b:is_mzscheme") || exists("is_mzscheme") syn keyword schemeExtFunc exn:i/o:tcp? exn:i/o:udp? exn:misc? exn:misc:application? exn:misc:unsupported? exn:module? exn:read? exn:read:non-char? syn keyword schemeExtFunc exn:special-comment? exn:syntax? exn:thread? exn:user? exn:variable? exn:application:mismatch? " Command-line parsing - syn keyword schemeExtFunc command-line current-command-line-arguments once-any help-labels multi once-each + syn keyword schemeExtFunc command-line current-command-line-arguments once-any help-labels multi once-each " syntax quoting, unquoting and quasiquotation syn region schemeUnquote matchgroup=Delimiter start="#," end=![ \t\[\]()";]!me=e-1 contains=ALL @@ -263,7 +266,7 @@ if exists("b:is_chicken") || exists("is_chicken") " here-string syn region schemeString start=+#<<\s*\z(.*\)+ end=+^\z1$+ - + if filereadable(expand(":p:h")."/cpp.vim") unlet! b:current_syntax syn include @ChickenC :p:h/cpp.vim @@ -282,7 +285,7 @@ if exists("b:is_chicken") || exists("is_chicken") " suggested by Alex Queiroz syn match schemeExtSyntax "#![-a-z!$%&*/:<=>?^_~0-9+.@#%]\+" - syn region schemeString start=+#<#\s*\z(.*\)+ end=+^\z1$+ + syn region schemeString start=+#<#\s*\z(.*\)+ end=+^\z1$+ endif " Synchronization and the wrapping up... @@ -322,3 +325,6 @@ if version >= 508 || !exists("did_scheme_syntax_inits") endif let b:current_syntax = "scheme" + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/syntax/sisu.vim b/runtime/syntax/sisu.vim index 6944782f01..4545ee8fa4 100644 --- a/runtime/syntax/sisu.vim +++ b/runtime/syntax/sisu.vim @@ -1,6 +1,8 @@ -"SiSU Vim syntax file -"SiSU Maintainer: Ralph Amissah -"SiSU Markup: SiSU (sisu-2.0.1, 2010-03-17) +" SiSU Vim syntax file +" SiSU Maintainer: Ralph Amissah +" SiSU Markup: SiSU (sisu-3.1.0) +" Last Change: 2011-10-03 +" URL: "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -9,15 +11,23 @@ elseif exists("b:current_syntax") finish else endif +let s:cpo_save = &cpo +set cpo&vim -" Errors: +"% "Errors: syn match sisu_error contains=sisu_link,sisu_error_wspace "" -" Markers Identifiers: +"% "Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" + syn match sisu_break contains=@NoSpell " \\\\\( \|$\)" syn match sisu_break contains=@NoSpell "
\|
" - syn match sisu_control contains=@NoSpell "<:p[bn]>" + syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$" + syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pr\|o\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pr\|o\)\]\s*$" syn match sisu_marktail "[~-]#" syn match sisu_control "\"" syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)" @@ -28,14 +38,18 @@ if !exists("sisu_no_identifiers") syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$" syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$" syn match sisu_structure "^:A\~$" - syn match sisu_sub_header_title "^\s\+:\(subtitle\|short\|edition\|language\|note\):\s" "group=sisu_header_content - syn match sisu_sub_header_creator "^\s\+:\(author\|translator\|illustrator\|photographer\|audio\|digitized_by\|prepared_by\):\s" - syn match sisu_sub_header_rights "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|audio\|digitization\|license\|all\):\s" "access_rights license - syn match sisu_sub_header_classify "^\s\+:\(type\|subject\|topic_register\|keywords\|coverage\|relation\|format\|identifier\|isbn\|dewey\|loc\|pg\):\s" - syn match sisu_sub_header_dates "^\s\+:\(published\|available\|created\|issued\|valid\|modified\|added_to_site\|translated\|original_publication\):\s" - syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|institution\|nationality\|source\):\s" - syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|italics\|bold\|skin\|stamp\|promo\|ad\|manpage\):\s" - syn match sisu_sub_header_notes "^\s\+:\(comment\|abstract\|description\|history\|prefix\|prefix_[ab]\):\s" + +"% "Document Sub Headers: + syn match sisu_sub_header_title "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content + syn match sisu_sub_header_creator "^\s\+:\(author\|editor\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s" " &hon &institution + syn match sisu_sub_header_rights "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s" " access_rights license + syn match sisu_sub_header_classify "^\s\+:\(topic_register\|coverage\|format\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\|oclc\|pg\|isbn\):\s" + syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s" + syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s" + syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s" + syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s" + +"% "semantic markers: (ignore) syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]" syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]" syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]" @@ -46,80 +60,126 @@ if !exists("sisu_no_identifiers") syn match sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";\[[^}].\{-}\];[a-z]\+" endif -"URLs Numbers And ASCII Codes: +"% "URLs Numbers And ASCII Codes: syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>" syn match sisu_number "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)" -"Tuned Error: (is error if not already matched) +"% "Tuned Error: (is error if not already matched) syn match sisu_error contains=sisu_error "[\~/\*!_]{\|}[\~/\*!_]" syn match sisu_error contains=sisu_error "]" -"Simple Paired Enclosed Markup: +"% "Simple Paired Enclosed Markup: "url/link syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$" -"header + +"% "Document Header: +" title syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" creator syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" dates +syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" publisher +syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" rights syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" classify document syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_dates matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" original language (depreciated) syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_source matchgroup=sisu_header start="^[@]source:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" notes +syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" +" links of interest syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" -"headings -syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$" -"grouped text -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table" -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$" -syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)" +" make, processing instructions +syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$" + +"% "Headings: +syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$" + +"% "Block Group Text: +" table +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table" +" table +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$" +" block, group, poem, alt +syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)" +" code syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code" -"endnotes -syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n" -syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n" -syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$" -"links and images -syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|\.\./\)\S\+" oneline -syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline -syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline -"some line operations -syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$" -syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$" + +"% "Endnotes: +" regular endnote or asterisk or plus sign endnote +syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n" +" numbered asterisk or plus sign endnote +syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n" +" endnote content marker (for binary content marking) +syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$" + +"% "Links And Images: +" image with url link (and possibly footnote of url) +syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|:\|\.\.\/\|#\)\S\+" oneline +" sisu outputs, short notation +syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline +" image +syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline + +"% "Some Line Operations: +" bold line +syn region sisu_bold contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^!_ " end=" \\\\\|$" +" indent and bullet paragraph +syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$" +" indent and bullet (bold start) paragraph +syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\)!_\? " end=" \\\\\|$" +" hanging indent paragraph [proposed] +syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9] " end="$" +" hanging indent (bold start/ definition) paragraph [proposed] +syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9]!_\? " end=" \\\\\|$" +" list numbering syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$" -"font face curly brackets + +"% "Font Face Curly Brackets: "syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline +" book index: syn region sisu_index matchgroup=sisu_index_block start="^={" end="}" -syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*" -syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!" -syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/" -syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^" -syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="}," +" emphasis: +syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*" +" bold: +syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!" +" underscore: +syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_" +" italics: +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/" +" added: +syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+" +" superscript: +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^" +" subscript: +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="}," +" monospace: +syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="#{" end="}#" +" strikethrough: syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-" -syn region sisu_html contains=sisu_error contains=sisu_strikeout matchgroup=sisu_contain start="" end="" oneline -"single words bold italicise etc. "workon -syn region sisu_control contains=sisu_error matchgroup=sisu_control start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline + +"% "Single Words Bold Italicise Etc: (depreciated) +syn region sisu_bold contains=sisu_error matchgroup=sisu_bold start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline "misc syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline -"Expensive Mode: +"% "Expensive Mode: if !exists("sisu_no_expensive") else " not Expensive syn region sisu_content_alt matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline endif " Expensive? -"Headers And Headings: (Document Instructions) +"% "Headers And Headings: (Document Instructions) syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+" syn region sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$" -"Errors: +"% "Errors: syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]" syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+" -syn match sisu_error_wspace contains=sisu_error_wspace " \s*$" +syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$" syn match sisu_error contains=sisu_error_wspace "\t\+" syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+" syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]" @@ -140,37 +200,37 @@ syn match sisu_error contains=sisu_error "" syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>" syn match sisu_error "/\?<\([biu]\)>[^()]\{-}\n$" -"Error Exceptions: +"% "Error Exceptions: syn match sisu_control "\n$" "contains=ALL -syn match sisu_control " //" +"syn match sisu_control " //" syn match sisu_error "%{" syn match sisu_error "
_\?https\?:\S\+\|_\?https\?:\S\+
" syn match sisu_error "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]" syn match sisu_comment "^%\{1,2\}.\+" -"Definitions Default Highlighting: +"% "Definitions Default Highlighting: hi def link sisu_normal Normal +hi def link sisu_bold Statement hi def link sisu_header PreProc hi def link sisu_header_content Normal hi def link sisu_sub_header_title Statement hi def link sisu_sub_header_creator Statement +hi def link sisu_sub_header_date Statement +hi def link sisu_sub_header_publisher Statement hi def link sisu_sub_header_rights Statement hi def link sisu_sub_header_classify Statement -hi def link sisu_sub_header_dates Statement -hi def link sisu_sub_header_make Statement +hi def link sisu_sub_header_original Statement hi def link sisu_sub_header_links Statement -hi def link sisu_sub_header_publisher Statement hi def link sisu_sub_header_notes Statement -hi def link sisu_sub_header_original Statement -hi def link sisu_sub_header_source Statement +hi def link sisu_sub_header_make Statement hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include -hi def link sisu_mark_endnote Include +hi def link sisu_mark_endnote Delimiter hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String -hi def link sisu_fontface Include +hi def link sisu_fontface Delimiter hi def link sisu_strikeout DiffDelete hi def link sisu_content_alt Special hi def link sisu_sem_content SpecialKey @@ -186,7 +246,7 @@ hi def link sisu_sem_ex_block Comment hi def link sisu_index SpecialKey hi def link sisu_index_block Visual hi def link sisu_content_endnote Special -hi def link sisu_control Define +hi def link sisu_control Delimiter hi def link sisu_ocn Include hi def link sisu_number Number hi def link sisu_identifier Function @@ -202,3 +262,5 @@ hi def link sisu_error_sem_marker Error hi def link sisu_error_wspace Error hi def link sisu_error Error let b:current_syntax = "sisu" +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/syntax/st.vim b/runtime/syntax/st.vim index d629eb4ed8..47aa07de5d 100644 --- a/runtime/syntax/st.vim +++ b/runtime/syntax/st.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Smalltalk " Maintainer: Arndt Hesse -" Last Change: 2001 May 09 +" Last Change: 2012 Feb 12 by Thilo Six " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -11,6 +11,9 @@ elseif exists("b:current_syntax") finish endif +let s:cpo_save = &cpo +set cpo&vim + " some Smalltalk keywords and standard methods syn keyword stKeyword super self class true false new not syn keyword stKeyword notNil isNil inspect out nil @@ -100,3 +103,6 @@ if version >= 508 || !exists("did_st_syntax_inits") endif let b:current_syntax = "st" + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim index 0cd770a276..c649430ed6 100644 --- a/runtime/syntax/svn.vim +++ b/runtime/syntax/svn.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: Subversion (svn) commit file -" Maintainer: Dmitry Vasiliev -" URL: http://www.hlabs.spb.ru/vim/svn.vim -" Revision: $Id: svn.vim 683 2008-07-30 11:52:38Z hdima $ +" Maintainer: Dmitry Vasiliev +" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/svn.vim +" Last Change: 2012-02-11 " Filenames: svn-commit*.tmp -" Version: 1.6 +" Version: 1.7 " Contributors: " Stefano Zacchiroli diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim index 178595cbce..9b28fd8f41 100644 --- a/runtime/syntax/synload.vim +++ b/runtime/syntax/synload.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Bram Moolenaar -" Last Change: 2010 Aug 08 +" Last Change: 2012 Feb 11 " This file sets up for syntax highlighting. " It is loaded from "syntax.vim" and "manual.vim". @@ -59,7 +59,7 @@ endfun " Handle adding doxygen to other languages (C, C++, C#, IDL) -au Syntax c,cpp,cs,idl +au Syntax c,cpp,cs,idl,php \ if (exists('b:load_doxygen_syntax') && b:load_doxygen_syntax) \ || (exists('g:load_doxygen_syntax') && g:load_doxygen_syntax) \ | runtime! syntax/doxygen.vim -- cgit v1.2.3