diff options
Diffstat (limited to 'vim')
m--------- | vim/3rdparty/vim-pathogen | 0 | ||||
-rw-r--r-- | vim/autoload/pathogen.vim | 266 | ||||
m--------- | vim/bundle/YouCompleteMe | 0 | ||||
m--------- | vim/bundle/lightline.vim | 0 | ||||
m--------- | vim/bundle/nerdcommenter | 0 | ||||
m--------- | vim/bundle/syntastic | 0 | ||||
m--------- | vim/bundle/tagbar | 0 | ||||
m--------- | vim/bundle/tlib_vim | 0 | ||||
m--------- | vim/bundle/ultisnips | 0 | ||||
m--------- | vim/bundle/vim-addon-mw-utils | 0 | ||||
m--------- | vim/bundle/vim-autotag | 0 | ||||
m--------- | vim/bundle/vim-gitgutter | 0 | ||||
m--------- | vim/bundle/vim-indent-guides | 0 | ||||
m--------- | vim/bundle/vim-repeat | 0 | ||||
m--------- | vim/bundle/vim-snippets | 0 | ||||
m--------- | vim/bundle/vim-surround | 0 | ||||
m--------- | vim/bundle/vim-table-mode | 0 | ||||
-rw-r--r-- | vim/ftdetect/c-co.vim | 1 | ||||
-rw-r--r-- | vim/ftdetect/conffile.vim | 1 | ||||
-rw-r--r-- | vim/ftdetect/make-co.vim | 1 | ||||
-rw-r--r-- | vim/ftplugin/python.vim | 2 | ||||
-rw-r--r-- | vim/syntax/c-co.vim | 475 | ||||
-rw-r--r-- | vim/syntax/conffile.vim | 37 | ||||
-rw-r--r-- | vim/syntax/iptables.vim | 380 | ||||
-rw-r--r-- | vim/syntax/make-co.vim | 153 |
25 files changed, 0 insertions, 1316 deletions
diff --git a/vim/3rdparty/vim-pathogen b/vim/3rdparty/vim-pathogen deleted file mode 160000 -Subproject ddfb1f14d7597e6aedc749be06b559a673c437a diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 2ec30e1..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,266 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope <http://tpo.pe/> -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() or an absolute path to invoke pathogen#surround(). -" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all -" subdirectories inside "bundle" inside all directories in the runtime path. -" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}" -" on versions of Vim without native package support. -function! pathogen#infect(...) abort - if a:0 - let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")') - else - let paths = ['bundle/{}', 'pack/{}/start/{}'] - endif - if has('packages') - call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"') - endif - let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$' - for path in filter(copy(paths), 'v:val =~# static') - call pathogen#surround(path) - endfor - for path in filter(copy(paths), 'v:val !~# static') - if path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call pathogen#surround(path) - else - call pathogen#interpose(path) - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') - return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")') -endfunction - -" Convert a list to a path. -function! pathogen#join(...) abort - if type(a:1) == type(1) && a:1 - let i = 1 - let space = ' ' - else - let i = 0 - let space = '' - endif - let path = "" - while i < a:0 - if type(a:000[i]) == type([]) - let list = a:000[i] - let j = 0 - while j < len(list) - let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g') - let path .= ',' . escaped - let j += 1 - endwhile - else - let path .= "," . a:000[i] - endif - let i += 1 - endwhile - return substitute(path,'^,','','') -endfunction - -" Convert a list to a path with escaped spaces for 'path', 'tag', etc. -function! pathogen#legacyjoin(...) abort - return call('pathogen#join',[1] + a:000) -endfunction - -" Turn filetype detection off and back on again if it was already enabled. -function! pathogen#cycle_filetype() abort - if exists('g:did_load_filetypes') - filetype off - filetype on - endif -endfunction - -" Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_blacklist or the -" comma delimited environment variable $VIMBLACKLIST. -function! pathogen#is_disabled(path) abort - if a:path =~# '\~$' - return 1 - endif - let sep = pathogen#slash() - let blacklist = - \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST) - if !empty(blacklist) - call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') - endif - return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction - -" Prepend the given directory to the runtime path and append its corresponding -" after directory. Curly braces are expanded with pathogen#expand(). -function! pathogen#surround(path) abort - let sep = pathogen#slash() - let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':s?[\\/]\=$??') - let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') - call filter(rtp, 'index(before + after, v:val) == -1') - let &rtp = pathogen#join(before, rtp, after) - return &rtp -endfunction - -" For each directory in the runtime path, add a second entry with the given -" argument appended. Curly braces are expanded with pathogen#expand(). -function! pathogen#interpose(name) abort - let sep = pathogen#slash() - let name = a:name - if has_key(s:done_bundles, name) - return "" - endif - let s:done_bundles[name] = 1 - let list = [] - for dir in pathogen#split(&rtp) - if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] - else - let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') - endif - endfor - let &rtp = pathogen#join(pathogen#uniq(list)) - return 1 -endfunction - -let s:done_bundles = {} - -" Invoke :helptags on all non-$VIM doc directories in runtimepath. -function! pathogen#helptags() abort - let sep = pathogen#slash() - for glob in pathogen#split(&rtp) - for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep') - if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir) - endif - endfor - endfor -endfunction - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort - for command in a:000 - execute command - endfor - return '' -endfunction - -" Section: Unofficial - -function! pathogen#is_absolute(path) abort - return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]') -endfunction - -" Given a string, returns all possible permutations of comma delimited braced -" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields -" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard -" and globbed. Actual globs are preserved. -function! pathogen#expand(pattern, ...) abort - let after = a:0 ? a:1 : '' - let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '') - if pattern =~# '{[^{}]\+}' - let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) - let found = map(split(pat, ',', 1), 'pre.v:val.post') - let results = [] - for pattern in found - call extend(results, pathogen#expand(pattern)) - endfor - elseif pattern =~# '{}' - let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)') - let post = pattern[strlen(pat) : -1] - let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') - else - let results = [pattern] - endif - let vf = pathogen#slash() . 'vimfiles' - call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') - return filter(results, '!empty(v:val)') -endfunction - -" \ on Windows unless shellslash is set, / everywhere else. -function! pathogen#slash() abort - return !exists("+shellslash") || &shellslash ? '/' : '\' -endfunction - -function! pathogen#separator() abort - return pathogen#slash() -endfunction - -" Convenience wrapper around glob() which returns a list. -function! pathogen#glob(pattern) abort - let files = split(glob(a:pattern),"\n") - return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction - -" Like pathogen#glob(), only limit the results to directories. -function! pathogen#glob_directories(pattern) abort - return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction - -" Remove duplicates from a list. -function! pathogen#uniq(list) abort - let i = 0 - let seen = {} - while i < len(a:list) - if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i]) - call remove(a:list,i) - elseif a:list[i] ==# '' - let i += 1 - let empty = 1 - else - let seen[a:list[i]] = 1 - let i += 1 - endif - endwhile - return a:list -endfunction - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe deleted file mode 160000 -Subproject 369fdade93adf23ef3da3b5f8e9fcd14a2b3f09 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim deleted file mode 160000 -Subproject 08f9e22c9ae4b9ecce32e7a617ef82cd419a8ac diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter deleted file mode 160000 -Subproject 285902752f7ab2052ac700a6d29b263dd5788af diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic deleted file mode 160000 -Subproject 5e1b26c1724448c9d870b08dc93ce7152848933 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar deleted file mode 160000 -Subproject d880bcc333938ee1ed4a99fd89480eff9b6502a diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim deleted file mode 160000 -Subproject 6f9d75b54478bcaab722d33cbec69d8a1fe49f3 diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips deleted file mode 160000 -Subproject 423f264e753cec260b4f14455126e6db7ba429a diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils deleted file mode 160000 -Subproject 0c5612fa31ee434ba055e21c76f456244b3b510 diff --git a/vim/bundle/vim-autotag b/vim/bundle/vim-autotag deleted file mode 160000 -Subproject 39f3790a307b663e228328513cb7a708be30466 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter deleted file mode 160000 -Subproject dc73a81bfe59a9de090b89a1312ded3c6f6a6f8 diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides deleted file mode 160000 -Subproject b40687195c01caf40f62d20093296590b48e3a7 diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat deleted file mode 160000 -Subproject 070ee903245999b2b79f7386631ffd29ce9b8e9 diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets deleted file mode 160000 -Subproject 9181f29981c0fe8d633f7dea6ce69338fe6b7a4 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround deleted file mode 160000 -Subproject e49d6c2459e0f5569ff2d533b4df995dd7f9831 diff --git a/vim/bundle/vim-table-mode b/vim/bundle/vim-table-mode deleted file mode 160000 -Subproject a646b4033ba86496ee0fff442ce854055104027 diff --git a/vim/ftdetect/c-co.vim b/vim/ftdetect/c-co.vim deleted file mode 100644 index b96a197..0000000 --- a/vim/ftdetect/c-co.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.c.co set filetype=c-co diff --git a/vim/ftdetect/conffile.vim b/vim/ftdetect/conffile.vim deleted file mode 100644 index 00feb56..0000000 --- a/vim/ftdetect/conffile.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *[cC]onffile,*.cf set filetype=conffile diff --git a/vim/ftdetect/make-co.vim b/vim/ftdetect/make-co.vim deleted file mode 100644 index dbaf43d..0000000 --- a/vim/ftdetect/make-co.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *[mM]akefile.co,*.mk.co,*.mak.co,*.dsp.co set filetype=make-co diff --git a/vim/ftplugin/python.vim b/vim/ftplugin/python.vim deleted file mode 100644 index 03b655f..0000000 --- a/vim/ftplugin/python.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal colorcolumn=79 -setlocal textwidth=79 diff --git a/vim/syntax/c-co.vim b/vim/syntax/c-co.vim deleted file mode 100644 index 0be5aa1..0000000 --- a/vim/syntax/c-co.vim +++ /dev/null @@ -1,475 +0,0 @@ -" Vim syntax file -" Language: C -" Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Jul 05 - -" Quit when a (custom) syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -let s:cpo_save = &cpo -set cpo&vim - -let s:ft = matchstr(&ft, '^\([^.]\)\+') - -" A bunch of useful C keywords -syn keyword cStatement goto break return continue asm -syn keyword cLabel case default -syn keyword cConditional if else switch -syn keyword cRepeat while for do - -syn keyword cTodo contained TODO FIXME XXX - -" It's easy to accidentally add a space after a backslash that was intended -" for line continuation. Some compilers allow it, which makes it -" unpredictable and should be avoided. -syn match cBadContinuation contained "\\\s\+$" - -" cCommentGroup allows adding matches for special things in comments -syn cluster cCommentGroup contains=cTodo,cBadContinuation - -" String and Character constants -" Highlight special characters (those which have a backslash) differently -syn match cSpecial display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)" -if !exists("c_no_utf") - syn match cSpecial display contained "\\\(u\x\{4}\|U\x\{8}\)" -endif -if exists("c_no_cformat") - syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend - " cCppString: same as cString, but ends at end of line - if !exists("cpp_no_cpp11") " ISO C++11 - syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell - else - syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell - 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 -else - if !exists("c_no_c99") " ISO C99 - syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained - else - syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained - endif - syn match cFormat display "%%" contained - syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend - " cCppString: same as cString, but ends at end of line - syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell -endif - -syn match cCharacter "L\='[^\\]'" -syn match cCharacter "L'[^']*'" contains=cSpecial -if exists("c_gnu") - syn match cSpecialError "L\='\\[^'\"?\\abefnrtv]'" - syn match cSpecialCharacter "L\='\\['\"?\\abefnrtv]'" -else - syn match cSpecialError "L\='\\[^'\"?\\abfnrtv]'" - syn match cSpecialCharacter "L\='\\['\"?\\abfnrtv]'" -endif -syn match cSpecialCharacter display "L\='\\\o\{1,3}'" -syn match cSpecialCharacter display "'\\x\x\{1,2}'" -syn match cSpecialCharacter display "L'\\x\x\+'" - -if !exists("c_no_c11") " ISO C11 - if exists("c_no_cformat") - syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend - else - syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend - endif - syn match cCharacter "[Uu]'[^\\]'" - syn match cCharacter "[Uu]'[^']*'" contains=cSpecial - if exists("c_gnu") - syn match cSpecialError "[Uu]'\\[^'\"?\\abefnrtv]'" - syn match cSpecialCharacter "[Uu]'\\['\"?\\abefnrtv]'" - else - syn match cSpecialError "[Uu]'\\[^'\"?\\abfnrtv]'" - syn match cSpecialCharacter "[Uu]'\\['\"?\\abfnrtv]'" - endif - syn match cSpecialCharacter display "[Uu]'\\\o\{1,3}'" - syn match cSpecialCharacter display "[Uu]'\\x\x\+'" -endif - -"when wanted, highlight trailing white space -if exists("c_space_errors") - if !exists("c_no_trail_space_error") - syn match cSpaceError display excludenl "\s\+$" - endif - if !exists("c_no_tab_space_error") - syn match cSpaceError display " \+\t"me=e-1 - endif -endif - -" This should be before cErrInParen to avoid problems with #define ({ xxx }) -if exists("c_curly_error") - syn match cCurlyError "}" - syn region cBlock start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold -else - syn region cBlock start="{" end="}" transparent fold -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,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom -if exists("c_no_curly_error") - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@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=')' 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 "^[{}]\|^<%\|^%>" - endif -elseif exists("c_no_bracket_error") - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@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=')' 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 "[{}]\|<%\|%>" - endif -else - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@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 - else - 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=']\|:>' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell - endif - " 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 - -if s:ft ==# 'c' || exists("cpp_no_cpp11") - syn region cBadBlock keepend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold -endif - -"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 -" Same, but without octal error (for comments) -syn match cNumbersCom display contained transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOctal -syn match cNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>" -"hex number -syn match cNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" -" Flag the first zero of an octal number as something special -syn match cOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=cOctalZero -syn match cOctalZero display contained "\<0" -syn match cFloat display contained "\d\+f" -"floating point number, with dot, optional exponent -syn match cFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" -"floating point number, starting with a dot, optional exponent -syn match cFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" -"floating point number, without dot, with exponent -syn match cFloat display contained "\d\+e[-+]\=\d\+[fl]\=\>" -if !exists("c_no_c99") - "hexadecimal floating point number, optional leading digits, with dot, with exponent - syn match cFloat display contained "0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>" - "hexadecimal floating point number, with leading digits, optional dot, with exponent - syn match cFloat display contained "0x\x\+\.\=p[-+]\=\d\+[fl]\=\>" -endif - -" flag an octal number with wrong digits -syn match cOctalError display contained "0\o*[89]\d*" -syn case match - -if exists("c_comment_strings") - " A comment can contain cString, cCharacter and cNumber. - " But a "*/" inside a cString in a cComment DOES end the comment! So we - " need to use a special type of cString: cCommentString, which also ends on - " "*/", and sees a "*" at the start of the line as comment again. - " Unfortunately this doesn't very well work for // type of comments :-( - syn match cCommentSkip contained "^\s*\*\($\|\s\+\)" - syn region cCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=cSpecial,cCommentSkip - syn region cComment2String contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=cSpecial - syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,@Spell - if exists("c_no_comment_fold") - " Use "extend" here to have preprocessor lines not terminate halfway a - " comment. - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cCommentString,cCharacter,cNumbersCom,cSpaceError,@Spell extend - else - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cCommentString,cCharacter,cNumbersCom,cSpaceError,@Spell fold extend - endif -else - syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cSpaceError,@Spell - if exists("c_no_comment_fold") - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell extend - else - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell fold extend - endif -endif -" keep a // comment separately, it terminates a preproc. conditional -syn match cCommentError display "\*/" -syn match cCommentStartError display "/\*"me=e-1 contained - -syn keyword cOperator sizeof -if exists("c_gnu") - syn keyword cStatement __asm__ - syn keyword cOperator typeof __real__ __imag__ -endif -syn keyword cType int long short char void -syn keyword cType signed unsigned float double -if !exists("c_no_ansi") || exists("c_ansi_typedefs") - syn keyword cType size_t ssize_t off_t wchar_t ptrdiff_t sig_atomic_t fpos_t - syn keyword cType clock_t time_t va_list jmp_buf FILE DIR div_t ldiv_t - syn keyword cType mbstate_t wctrans_t wint_t wctype_t -endif -if !exists("c_no_c99") " ISO C99 - syn keyword cType _Bool bool _Complex complex _Imaginary imaginary - syn keyword cType int8_t int16_t int32_t int64_t - syn keyword cType uint8_t uint16_t uint32_t uint64_t - syn keyword cType int_least8_t int_least16_t int_least32_t int_least64_t - syn keyword cType uint_least8_t uint_least16_t uint_least32_t uint_least64_t - syn keyword cType int_fast8_t int_fast16_t int_fast32_t int_fast64_t - syn keyword cType uint_fast8_t uint_fast16_t uint_fast32_t uint_fast64_t - syn keyword cType intptr_t uintptr_t - syn keyword cType intmax_t uintmax_t -endif -if exists("c_gnu") - syn keyword cType __label__ __complex__ __volatile__ -endif - -syn keyword cStructure struct union enum typedef -syn keyword cStorageClass static register auto volatile extern const -if exists("c_gnu") - syn keyword cStorageClass inline __attribute__ -endif -if !exists("c_no_c99") - syn keyword cStorageClass inline restrict -endif -if !exists("c_no_c11") - syn keyword cStorageClass _Alignas alignas - syn keyword cOperator _Alignof alignof - syn keyword cStorageClass _Atomic - syn keyword cOperator _Generic - syn keyword cStorageClass _Noreturn noreturn - syn keyword cOperator _Static_assert static_assert - syn keyword cStorageClass _Thread_local thread_local - syn keyword cType char16_t char32_t -endif - -if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu") - if exists("c_gnu") - syn keyword cConstant __GNUC__ __FUNCTION__ __PRETTY_FUNCTION__ __func__ - endif - syn keyword cConstant __LINE__ __FILE__ __DATE__ __TIME__ __STDC__ - syn keyword cConstant __STDC_VERSION__ - syn keyword cConstant CHAR_BIT MB_LEN_MAX MB_CUR_MAX - syn keyword cConstant UCHAR_MAX UINT_MAX ULONG_MAX USHRT_MAX - syn keyword cConstant CHAR_MIN INT_MIN LONG_MIN SHRT_MIN - syn keyword cConstant CHAR_MAX INT_MAX LONG_MAX SHRT_MAX - syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN - syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX - if !exists("c_no_c99") - syn keyword cConstant __func__ - syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX - syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN - syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX - syn keyword cConstant UINT8_MAX UINT16_MAX UINT32_MAX UINT64_MAX - syn keyword cConstant INT_LEAST8_MIN INT_LEAST16_MIN INT_LEAST32_MIN INT_LEAST64_MIN - syn keyword cConstant INT_LEAST8_MAX INT_LEAST16_MAX INT_LEAST32_MAX INT_LEAST64_MAX - syn keyword cConstant UINT_LEAST8_MAX UINT_LEAST16_MAX UINT_LEAST32_MAX UINT_LEAST64_MAX - syn keyword cConstant INT_FAST8_MIN INT_FAST16_MIN INT_FAST32_MIN INT_FAST64_MIN - syn keyword cConstant INT_FAST8_MAX INT_FAST16_MAX INT_FAST32_MAX INT_FAST64_MAX - syn keyword cConstant UINT_FAST8_MAX UINT_FAST16_MAX UINT_FAST32_MAX UINT_FAST64_MAX - syn keyword cConstant INTPTR_MIN INTPTR_MAX UINTPTR_MAX - syn keyword cConstant INTMAX_MIN INTMAX_MAX UINTMAX_MAX - syn keyword cConstant PTRDIFF_MIN PTRDIFF_MAX SIG_ATOMIC_MIN SIG_ATOMIC_MAX - syn keyword cConstant SIZE_MAX WCHAR_MIN WCHAR_MAX WINT_MIN WINT_MAX - endif - syn keyword cConstant FLT_RADIX FLT_ROUNDS - syn keyword cConstant FLT_DIG FLT_MANT_DIG FLT_EPSILON - syn keyword cConstant DBL_DIG DBL_MANT_DIG DBL_EPSILON - syn keyword cConstant LDBL_DIG LDBL_MANT_DIG LDBL_EPSILON - syn keyword cConstant FLT_MIN FLT_MAX FLT_MIN_EXP FLT_MAX_EXP - syn keyword cConstant FLT_MIN_10_EXP FLT_MAX_10_EXP - syn keyword cConstant DBL_MIN DBL_MAX DBL_MIN_EXP DBL_MAX_EXP - syn keyword cConstant DBL_MIN_10_EXP DBL_MAX_10_EXP - syn keyword cConstant LDBL_MIN LDBL_MAX LDBL_MIN_EXP LDBL_MAX_EXP - syn keyword cConstant LDBL_MIN_10_EXP LDBL_MAX_10_EXP - syn keyword cConstant HUGE_VAL CLOCKS_PER_SEC NULL - syn keyword cConstant LC_ALL LC_COLLATE LC_CTYPE LC_MONETARY - syn keyword cConstant LC_NUMERIC LC_TIME - syn keyword cConstant SIG_DFL SIG_ERR SIG_IGN - syn keyword cConstant SIGABRT SIGFPE SIGILL SIGHUP SIGINT SIGSEGV SIGTERM - " Add POSIX signals as well... - syn keyword cConstant SIGABRT SIGALRM SIGCHLD SIGCONT SIGFPE SIGHUP - syn keyword cConstant SIGILL SIGINT SIGKILL SIGPIPE SIGQUIT SIGSEGV - syn keyword cConstant SIGSTOP SIGTERM SIGTRAP SIGTSTP SIGTTIN SIGTTOU - syn keyword cConstant SIGUSR1 SIGUSR2 - syn keyword cConstant _IOFBF _IOLBF _IONBF BUFSIZ EOF WEOF - syn keyword cConstant FOPEN_MAX FILENAME_MAX L_tmpnam - syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET - syn keyword cConstant TMP_MAX stderr stdin stdout - syn keyword cConstant EXIT_FAILURE EXIT_SUCCESS RAND_MAX - " Add POSIX errors as well - syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY - syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT - syn keyword cConstant EFBIG EILSEQ EINPROGRESS EINTR EINVAL EIO EISDIR - syn keyword cConstant EMFILE EMLINK EMSGSIZE ENAMETOOLONG ENFILE ENODEV - syn keyword cConstant ENOENT ENOEXEC ENOLCK ENOMEM ENOSPC ENOSYS - syn keyword cConstant ENOTDIR ENOTEMPTY ENOTSUP ENOTTY ENXIO EPERM - syn keyword cConstant EPIPE ERANGE EROFS ESPIPE ESRCH ETIMEDOUT EXDEV - " math.h - syn keyword cConstant M_E M_LOG2E M_LOG10E M_LN2 M_LN10 M_PI M_PI_2 M_PI_4 - syn keyword cConstant M_1_PI M_2_PI M_2_SQRTPI M_SQRT2 M_SQRT1_2 -endif -if !exists("c_no_c99") " ISO C99 - syn keyword cConstant true false -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 cPreConditMatch display "^\s*\(%:\|#\)\s*\(else\|endif\)\>" -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,@NoSpell fold - 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,@Spell fold - else - syn region cCppOutIf2 contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell - 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 fold - syn region cCppInIf contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit - if !exists("c_no_if0_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 cCppInElse contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 - endif - syn region cCppInElse2 contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell - 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,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock -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,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString -if s:ft ==# 'c' || exists("cpp_no_cpp11") - syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell -endif -" Avoid matching foo::bar() in C++ by requiring that the next char is not ':' -syn cluster cLabelGroup contains=cUserLabel -syn match cUserCont display "^\s*\I\i*\s*:$" contains=@cLabelGroup -syn match cUserCont display ";\s*\I\i*\s*:$" contains=@cLabelGroup -syn match cUserCont display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup -syn match cUserCont display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup - -syn match cUserLabel display "\I\i*" contained - -" Avoid recognizing most bitfields as labels -syn match cBitField display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType -syn match cBitField display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType - -if exists("c_minlines") - let b:c_minlines = c_minlines -else - if !exists("c_no_if0") - let b:c_minlines = 50 " #if 0 constructs can be long - else - let b:c_minlines = 15 " mostly for () constructs - endif -endif -if exists("c_curly_error") - syn sync fromstart -else - exec "syn sync ccomment cComment minlines=" . b:c_minlines -endif - -" config output file -syn match covariable "\$\w\+" -syn match cocommand "\$\(endif\|else\)" -syn region None matchgroup=coifcommand start=+\$if(+ end=+)+ contains=covariable - -" Define the default highlighting. -" Only used when an item doesn't have highlighting yet -hi def link cFormat cSpecial -hi def link cCppString cString -hi def link cCommentL cComment -hi def link cCommentStart cComment -hi def link cLabel Label -hi def link cUserLabel Label -hi def link cConditional Conditional -hi def link cRepeat Repeat -hi def link cCharacter Character -hi def link cSpecialCharacter cSpecial -hi def link cNumber Number -hi def link cOctal Number -hi def link cOctalZero PreProc " link this to Error if you want -hi def link cFloat Float -hi def link cOctalError cError -hi def link cParenError cError -hi def link cErrInParen cError -hi def link cErrInBracket cError -hi def link cCommentError cError -hi def link cCommentStartError cError -hi def link cSpaceError cError -hi def link cSpecialError cError -hi def link cCurlyError cError -hi def link cOperator Operator -hi def link cStructure Structure -hi def link cStorageClass StorageClass -hi def link cInclude Include -hi def link cPreProc PreProc -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 -hi def link cCommentString cString -hi def link cComment2String cString -hi def link cCommentSkip cComment -hi def link cString String -hi def link cComment Comment -hi def link cSpecial SpecialChar -hi def link cTodo Todo -hi def link cBadContinuation Error -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 - -hi def link cocommand Macro -hi def link coifcommand Macro -hi def link covariable Identifier - -let b:current_syntax = "c-co" - -unlet s:ft - -let &cpo = s:cpo_save -unlet s:cpo_save -" vim: ts=8 diff --git a/vim/syntax/conffile.vim b/vim/syntax/conffile.vim deleted file mode 100644 index 342d8b4..0000000 --- a/vim/syntax/conffile.vim +++ /dev/null @@ -1,37 +0,0 @@ -" Vim syntax file -" Language: C -" Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Jul 05 - -" Quit when a (custom) syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -left s:ft = matchstr(&ft, '^\([^.]\)\+') - -syn match sComment "#.*$" -syn keyword sKeywords typedef menu group endmenu endgroup type menu default menu visible nodefault -syn keyword sKWCondition dependency default -syn keyword sTypes int bool string hex float -syn region sString start=+\"+ skip=+\\.+ end=+\"+ - -syn keyword sKeywords output nextgroup=sOutput -syn region sOutput start="\w\+ \+{" end="}" contains=covariable,cocommand,coifcommand,CoNone -syn match sOutput "\w\+ \+\w\+" -syn match covariable "\$\w\+" contained -syn match cocommand "\$\(endif\|else\)" contained -syn region CoNone matchgroup=coifcommand start=+\$\(if\|elif\|ifdep\)(+ end=+)+ contains=covariable,sKWCondition contained - - -hi def link sComment Comment -hi def link sKeywords Precondit -hi def link sKWCondition sKeywords -hi def link sTypes Statement -hi def link sString String - -hi def link cocommand Macro -hi def link coifcommand Macro -hi def link covariable Identifier - -let b:current_syntax = "conffile" diff --git a/vim/syntax/iptables.vim b/vim/syntax/iptables.vim deleted file mode 100644 index 0f65a61..0000000 --- a/vim/syntax/iptables.vim +++ /dev/null @@ -1,380 +0,0 @@ -"============================================================================ -" -" Source: https://raw.githubusercontent.com/vim-scripts/iptables/master/syntax/iptables.vim -" iptables-save/restore syntax highlighter -" -" Language: iptables-save/restore file -" Version: Not Specified -" Date: 07-Jun-2014 -" Maintainer: Eric Haarbauer <ehaar70{AT}gmail{DOT}com> -" License: This file is placed in the public domain. -" -"============================================================================ -" Section: Notes {{{1 -"============================================================================ -" -" This vim syntax script highlights files used by Harald Welte's iptables-save -" and iptables-restore utilities. Both utilities are part of the iptables -" application (http://www.netfilter.org/projects/iptables). -" -" Features: -" -" * Distinguishes commands, options, modules, targets and chains. -" * Distinguishes numeric IP addresses from net masks. -" * Highlights tokens that occur only in hand-edited files; for example, -" "--append" and "destination-unreachable". -" * Special handling for module names; for example, the tcp module is -" colored differently from the tcp protocol. -" -" Options: -" -" Customize the behavior of this script by setting values for the following -" options in your .vimrc file. (Type ":h vimrc" in vim for more information -" on the .vimrc file.) -" -" g:Iptables_SpecialDelimiters -" This variable, if set to a non-zero value, distinguishes numeric -" delimiters, including the dots in IP addresses, the slash that separates -" an IP address from a netmask, and the colon that separates the ends of a -" port range. If not set, this option defaults to off. -" -" Known Issues: -" -" * Some special argument tokens are highlighted whether or not they are -" used with the correct option. For example, "destination-unreachable" -" gets special highlighting whether or not is used as an argument to the -" --icmp-type option. In practice, this is rarely a problem. -" -" Reporting Issues: -" -" If you discover an iptables file that this script highlights incorrectly, -" please email the author (address at the top of the script) with the -" following information: -" -" * Problem iptables file WITH ANY SENSITIVE INFORMATION REMOVED -" * The release version of this script (see top of the script) -" * If possible, a patch to fix the problem -" -" Design Notes: -" -" Part of this script is autogenerated from the output of the iptables man -" page. The source code for generating the script is available from the -" author on request (see email address at the top of the script). The -" script should build from source on most Linux systems with iptables -" installed. -" -" The build system that generates this script strips special CVS tokens -" (like "Id:") so that CVS no longer recognizes them. This allows users to -" place the script in their own version control system without losing -" information. The author encourages other vim script developers to adopt a -" similar approach in their own scripts. -" -" Installation: -" -" Put this file in your user runtime syntax directory, usually ~/.vim/syntax -" in *NIX or C:\Program Files\vim\vimfiles\syntax in Windows. Type ":h -" syn-files" from within vim for more information. -" -" The iptables-save and iptables-restore applications do not specify a -" naming standard for the files they use. However, iptables-save places a -" comment in the first line of its output. Other applications, such as -" Fedora's system-config-securitylevel uses the iptables-save/restore -" format, but with a different leading comment. We can use these leading -" comments to identify the filetype by placing the following code in the -" scripts.vim file in your user runtime directory: -" -" if getline(1) =~ "^# Generated by iptables-save" || -" \ getline(1) =~ "^# Firewall configuration written by" -" setfiletype iptables -" set commentstring=#%s -" finish -" endif -" -" Setting the commentstring on line 4 allows Meikel Brandmeyer's -" EnhancedCommentify script (vimscript #23) to work with iptables files. -" (Advanced users may want to set the commentstring option in an ftplugin -" file or in autocommands defined in .vimrc.) -" -"============================================================================ -" Source File: Id: iptables.src.vim 43 2014-06-08 03:21:32Z ehaar -"============================================================================ -" Section: Initialization {{{1 -"============================================================================ - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") - finish - endif - let main_syntax = 'iptables' -endif - -" Don't use standard HiLink, it will not work with included syntax files -if version < 508 - command! -nargs=+ IptablesHiLink highlight link <args> -else - command! -nargs=+ IptablesHiLink highlight default link <args> -endif - -syntax case match - -if version < 600 - set iskeyword+=- -else - setlocal iskeyword+=- -endif - -" Initialize global public variables: {{{2 - -" Support deprecated variable name used prior to release 1.07. -if exists("g:iptablesSpecialDelimiters") && -\ !exists("g:Iptables_SpecialDelimiters") - - let g:Iptables_SpecialDelimiters = g:iptablesSpecialDelimiters - unlet g:iptablesSpecialDelimiters - " echohl WarningMsg | echo "Warning:" | echohl None - " echo "The g:iptablesSpecialDelimiters variable is deprecated." - " echo "Please use g:Iptables_SpecialDelimiters in your .vimrc instead" - -endif - -if exists("g:Iptables_SpecialDelimiters") - let s:Iptables_SpecialDelimiters = g:Iptables_SpecialDelimiters -else - let s:Iptables_SpecialDelimiters = 0 -endif - -"============================================================================ -" Section: Group Definitions {{{1 -"============================================================================ - -syntax keyword iptablesSaveDirective COMMIT -syntax match iptablesSaveOperation "^[:*]" - -syntax keyword iptablesTable filter nat mangle raw - -syntax keyword iptablesTarget - \ ACCEPT DROP QUEUE RETURN BALANCE CLASSIFY CLUSTERIP CONNMARK - \ CONNSECMARK CONNTRACK DNAT DSCP ECN IPMARK IPV4OPSSTRIP LOG - \ MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT - \ ROUTE SAME SECMARK SET SNAT TARPIT TCPMSS TOS TRACE TTL ULOG XOR - -syntax keyword iptablesBuiltinChain - \ INPUT OUTPUT FORWARD PREROUTING POSTROUTING - -syntax keyword iptablesCommand -A -D -I -R -L -F -Z -N -X -P -E - \ --append --delete --insert --replace --list --flush --zero - \ --new-chain --delete-chain --policy --rename-chain - -syntax keyword iptablesParam -p -s -d -j -i -o -f -c -t - -syntax match iptablesOperator "\s\zs!\ze\s" - -syntax keyword iptablesModuleName contained - \ account addrtype ah childlevel comment condition connbytes connlimit - \ connmark connrate conntrack dccp dscp dstlimit ecn esp fuzzy hashlimit - \ helper icmp iprange ipv4options length limit mac mark mport multiport - \ nth osf owner physdev pkttype policy psd quota random realm recent - \ sctp set state string tcp tcpmss time tos ttl u32 udp unclean - -syntax keyword iptablesModuleType - \ UNSPEC UNICAST LOCAL BROADCAST ANYCAST MULTICAST BLACKHOLE UNREACHABLE - \ PROHIBIT THROW NAT XRESOLVE INVALID ESTABLISHED NEW RELATED SYN ACK FIN - \ RST URG PSH ALL NONE - -" From --reject-with option -syntax keyword iptablesModuleType - \ icmp-net-unreachable - \ icmp-host-unreachable - \ icmp-port-unreachable - \ icmp-proto-unreachable - \ icmp-net-prohibited - \ icmp-host-prohibited - \ icmp-admin-prohibited - -" From --icmp-type option -syntax keyword iptablesModuleType - \ any - \ echo-reply - \ destination-unreachable - \ network-unreachable - \ host-unreachable - \ protocol-unreachable - \ port-unreachable - \ fragmentation-needed - \ source-route-failed - \ network-unknown - \ host-unknown - \ network-prohibited - \ host-prohibited - \ TOS-network-unreachable - \ TOS-host-unreachable - \ communication-prohibited - \ host-precedence-violation - \ precedence-cutoff - \ source-quench - \ redirect - \ network-redirect - \ host-redirect - \ TOS-network-redirect - \ TOS-host-redirect - \ echo-request - \ router-advertisement - \ router-solicitation - \ time-exceeded - \ ttl-zero-during-transit - \ ttl-zero-during-reassembly - \ parameter-problem - \ ip-header-bad - \ required-option-missing - \ timestamp-request - \ timestamp-reply - \ address-mask-request - \ address-mask-reply - -" If we used a keyword for this, port names would be colored the same -" as modules with the same name (e.g. tcp, udp, icmp). -syntax keyword iptablesParam -m --match skipwhite nextgroup=iptablesModuleName - -syntax region iptablesString start=+"+ skip=+\\"+ end=+"+ oneline - -syntax match iptablesComment "^#.*" contains=iptablesTodo -syntax match iptablesBadComment "^\s\+\zs#.*" " Pound must be in first column - -syntax keyword iptablesTodo contained TODO FIXME XXX NOT NOTE - -" Special Delimiters: {{{2 - -if s:Iptables_SpecialDelimiters != 0 - syntax match iptablesNumber "\<[0-9./:]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "[./:]" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -else " s:Iptables_SpecialDelimiters == 0 - syntax match iptablesNumber "\<[0-9./]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "/" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -endif - -"============================================================================ -" Section: Autogenerated Groups {{{2 -"============================================================================ - -" Begin autogenerated section. -" iptables2vim: "iptables2vim 43 2014-06-08 03:21:32Z ehaar" -" iptables: "iptables v1.4.19.1" - -syntax keyword iptablesLongParam - \ --zone --xor-tos --xor-mark --weekdays --vproto --vportctl --vport - \ --vmethod --verbose --vdir --validmark --vaddr --update - \ --ulog-qthreshold --ulog-prefix --ulog-nlgroup --ulog-cprange - \ --uid-owner --u --type --tunnel-src --tunnel-dst --ttl-set --ttl-lt - \ --ttl-inc --ttl-gt --ttl-eq --ttl-dec --ttl --transparent --tproxy-mark - \ --total-nodes --tos --to-source --to-ports --to-port --to-destination - \ --to --timestop --timestart --timeout --tcp-option --tcp-flags --table - \ --syn --strip-options --string --strict --state --src-type --src-range - \ --src-pfx --src-group --src --sports --sport --spi --source-ports - \ --source-port --source --soft --socket-exists --set-xmark --set-tos - \ --set-mss --set-mark --set-dscp-class --set-dscp --set-counters - \ --set-class --set --selctx --seconds --save-mark --save --rttl --rt-type - \ --rt-segsleft --rt-len --rt- --rsource --return--nomatch --restore-mark - \ --restore --reqid --remove --reject-with --reap --realm --rdest --rcheck - \ --rateest-pps --rateest-name --rateest-lt --rateest-interval - \ --rateest-gt --rateest-ewmalog --rateest-eq --rateest-delta - \ --rateest-bps --rateest --random --quota --queue-num --queue-bypass - \ --queue-balance --protocol --proto --probability --ports --pol - \ --pkt-type --physdev-out --physdev-is-out --physdev-is-in - \ --physdev-is-bridged --physdev-in --persistent --packet --out-interface - \ --or-tos --or-mark --on-port --on-ip --numeric --notrack --nodst - \ --nflog-threshold --nflog-range --nflog-prefix --nflog-group - \ --nfacct-name --next --new --name --mss --monthdays --modprobe --mode - \ --mh-type --mask --mark --mangle-mac-d --mac-source --loose --log-uid - \ --log-tcp-sequence --log-tcp-options --log-prefix --log-level - \ --log-ip-options --log --local-node --line-numbers --limit-iface-out - \ --limit-iface-in --limit-burst --limit --length --led-trigger-id - \ --led-delay --led-always-blink --label --kerneltz --jump --ipvs --ipv - \ --invert --in-interface --icmpv --icmp-type --hmark-tuple - \ --hmark-src-prefix --hmark-sport-mask --hmark-spi-mask --hmark-rnd - \ --hmark-proto-mask --hmark-offset --hmark-mod --hmark-dst-prefix - \ --hmark-dport-mask --hl-set --hl-lt --hl-inc --hl-gt --hl-eq --hl-dec - \ --hitcount --hex-string --helper --help --header --hbh-opts --hbh-len - \ --hashmode --hashlimit-upto --hashlimit-srcmask --hashlimit-src - \ --hashlimit-name --hashlimit-mode --hashlimit-mask - \ --hashlimit-htable-size --hashlimit-htable-max - \ --hashlimit-htable-gcinterval --hashlimit-htable-expire - \ --hashlimit-dstmask --hashlimit-burst --hashlimit-above --hashlimit - \ --hash-init --h-length --goto --gid-owner --genre --gateway --from - \ --fragres --fragmore --fragment --fraglen --fraglast --fragid - \ --fragfirst --expevents --exist --exact --every --espspi - \ --ecn-tcp-remove --ecn-tcp-ece --ecn-tcp-cwr --ecn-ip-ect --dst-type - \ --dst-range --dst-pfx --dst-opts --dst-len --dst-group --dst - \ --dscp-class --dscp --dports --dport --dir --destination-ports - \ --destination-port --destination --del-set --dccp-types --dccp-option - \ --datestop --datestart --ctstatus --ctstate --ctreplsrcport --ctreplsrc - \ --ctrepldstport --ctrepldst --ctproto --ctorigsrcport --ctorigsrc - \ --ctorigdstport --ctorigdst --ctexpire --ctevents --ctdir --cpu - \ --contiguous --connlimit-upto --connlimit-saddr --connlimit-mask - \ --connlimit-daddr --connlimit-above --connbytes-mode --connbytes-dir - \ --connbytes --comment --clustermac --cluster-total-nodes - \ --cluster-local-nodemask --cluster-local-node --cluster-hash-seed --clus - \ --clamp-mss-to-pmtu --chunk-types --checksum-fill --check --bytecode - \ --and-tos --and-mark --algo --ahspi --ahres --ahlen --add-set - \ --accept-local -" End autogenerated section. - -"============================================================================ -" Section: Group Linking {{{1 -"============================================================================ - -IptablesHiLink iptablesSaveDirective PreProc -IptablesHiLink iptablesSaveOperation PreProc - -IptablesHiLink iptablesTable Statement -IptablesHiLink iptablesTarget Statement -IptablesHiLink iptablesBuiltinChain Type - -IptablesHiLink iptablesCommand Operator - -IptablesHiLink iptablesModuleName Type -IptablesHiLink iptablesModuleType Type - -IptablesHiLink iptablesOperator Operator -IptablesHiLink iptablesParam Identifier -IptablesHiLink iptablesLongParam Identifier - -IptablesHiLink iptablesNumber Constant - -if s:Iptables_SpecialDelimiters != 0 - IptablesHiLink iptablesMask PreProc - IptablesHiLink iptablesDelimiter Delimiter -else " s:Iptables_SpecialDelimiters == 0 - IptablesHiLink iptablesMask Special - IptablesHiLink iptablesDelimiter None -endif - -IptablesHiLink iptablesString Constant - -IptablesHiLink iptablesComment Comment -IptablesHiLink iptablesBadComment Error -IptablesHiLink iptablesTodo Todo - -"============================================================================ -" Section: Clean Up {{{1 -"============================================================================ - -delcommand IptablesHiLink - -let b:current_syntax = "iptables" - -if main_syntax == 'iptables' - unlet main_syntax -endif - -" Autoconfigure vim indentation settings -" vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=- diff --git a/vim/syntax/make-co.vim b/vim/syntax/make-co.vim deleted file mode 100644 index 371944b..0000000 --- a/vim/syntax/make-co.vim +++ /dev/null @@ -1,153 +0,0 @@ -" Vim syntax file -" Language: Makefile -" Maintainer: Claudio Fleiner <claudio@fleiner.com> -" URL: http://www.fleiner.com/vim/syntax/make.vim -" Last Change: 2012 Oct 05 - -" 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") - finish -endif - -let s:cpo_save = &cpo -set cpo&vim - - -" some special characters -syn match makeSpecial "^\s*[@+-]\+" -syn match makeNextLine "\\\n\s*" - -" some directives -syn match makePreCondit "^ *\(ifeq\>\|else\>\|endif\>\|ifneq\>\|ifdef\>\|ifndef\>\)" -syn match makeInclude "^ *[-s]\=include" -syn match makeStatement "^ *vpath" -syn match makeExport "^ *\(export\|unexport\)\>" -syn match makeOverride "^ *override" -hi link makeOverride makeStatement -hi link makeExport makeStatement - -" catch unmatched define/endef keywords. endef only matches it is by itself on a line, possibly followed by a commend -syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains=makeStatement,makeIdent,makePreCondit,makeDefine - -" Microsoft Makefile specials -syn case ignore -syn match makeInclude "^! *include" -syn match makePreCondit "! *\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|elseif\|else if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>" -syn case match - -" identifiers -syn region makeIdent start="\\\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeSString,makeDString -syn region makeIdent start="\\\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString -syn match makeIdent "\$\$\w*" -syn match makeIdent "\$[^({]" -syn match makeIdent "^ *\a\w*\s*[:+?!*]="me=e-2 -syn match makeIdent "^ *\a\w*\s*="me=e-1 -syn match makeIdent "%" - -" Makefile.in variables -syn match makeConfig "@[A-Za-z0-9_]\+@" - -" make targets -" syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>" -syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource -syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource - -syn region makeTarget transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeTarget "^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError - -syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent skipnl nextgroup=makeCommands,makeCommandError - -syn match makeCommandError "^\s\+\S.*" contained -syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError -syn match makeCmdNextLine "\\\n."he=e-1 contained - - -" Statements / Functions (GNU make) -syn match makeStatement contained "(\(subst\|abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1 - -" Comment -if exists("make_microsoft") - syn match makeComment "#.*" contains=@Spell,makeTodo -elseif !exists("make_no_comments") - syn region makeComment start="#" end="^$" end="[^\\]$" keepend contains=@Spell,makeTodo - syn match makeComment "#$" contains=@Spell -endif -syn keyword makeTodo TODO FIXME XXX contained - -" match escaped quotes and any other escaped character -" except for $, as a backslash in front of a $ does -" not make it a standard character, but instead it will -" still act as the beginning of a variable -" The escaped char is not highlightet currently -syn match makeEscapedChar "\\[^$]" - - -syn region makeDString start=+\(\\\)\@<!"+ skip=+\\.+ end=+"+ contains=makeIdent -syn region makeSString start=+\(\\\)\@<!'+ skip=+\\.+ end=+'+ contains=makeIdent -syn region makeBString start=+\(\\\)\@<!`+ skip=+\\.+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine - -" Syncing -syn sync minlines=20 maxlines=200 - -" Sync on Make command block region: When searching backwards hits a line that -" can't be a command or a comment, use makeCommands if it looks like a target, -" NONE otherwise. -syn sync match makeCommandSync groupthere NONE "^[^\t#]" -syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]" -syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}\s*$" - -" config output file -syn match covariable "\$\w\+" -syn match cocommand "\$\(endif\|else\)" -syn region None matchgroup=coifcommand start=+\$if(+ end=+)+ contains=covariable - -" 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_make_syn_inits") - if version < 508 - let did_make_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink makeNextLine makeSpecial - HiLink makeCmdNextLine makeSpecial - HiLink makeSpecTarget Statement - if !exists("make_no_commands") - HiLink makeCommands Number - endif - HiLink makeImplicit Function - HiLink makeTarget Function - HiLink makeInclude Include - HiLink makePreCondit PreCondit - HiLink makeStatement Statement - HiLink makeIdent Identifier - HiLink makeSpecial Special - HiLink makeComment Comment - HiLink makeDString String - HiLink makeSString String - HiLink makeBString Function - HiLink makeError Error - HiLink makeTodo Todo - HiLink makeDefine Define - HiLink makeCommandError Error - HiLink makeConfig PreCondit - - HiLink cocommand Macro - HiLink coifcommand Macro - HiLink covariable Identifier - - delcommand HiLink -endif - -let b:current_syntax = "make-co" - -let &cpo = s:cpo_save -unlet s:cpo_save -" vim: ts=8 |