From 59a65053a7a67a47dac59a0c04a283e4ad39ed98 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 27 Sep 2010 00:43:43 +1000 Subject: [PATCH] Update Teledactyl related Vim runtime files. --HG-- rename : teledactyl/contrib/vim/ftdetect/muttator.vim => teledactyl/contrib/vim/ftdetect/teledactyl.vim rename : teledactyl/contrib/vim/syntax/muttator.vim => teledactyl/contrib/vim/syntax/teledactyl.vim extra : rebase_source : 46fb45b2e516c953617080ddf417d5ecc5c724ba --- .../contrib/vim/ftdetect/pentadactyl.vim | 2 +- .../contrib/vim/syntax/pentadactyl.vim | 6 +- teledactyl/contrib/vim/ftdetect/muttator.vim | 2 - .../contrib/vim/ftdetect/teledactyl.vim | 1 + teledactyl/contrib/vim/syntax/muttator.vim | 103 ----------------- teledactyl/contrib/vim/syntax/teledactyl.vim | 107 ++++++++++++++++++ xulmus/contrib/vim/syntax/xulmus.vim | 4 +- 7 files changed, 114 insertions(+), 111 deletions(-) delete mode 100644 teledactyl/contrib/vim/ftdetect/muttator.vim create mode 100644 teledactyl/contrib/vim/ftdetect/teledactyl.vim delete mode 100644 teledactyl/contrib/vim/syntax/muttator.vim create mode 100644 teledactyl/contrib/vim/syntax/teledactyl.vim diff --git a/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim b/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim index 146bab18..19624dfc 100644 --- a/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim +++ b/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim @@ -1 +1 @@ -au BufNewFile,BufRead *pentadactylrc* set filetype=pentadactyl +au BufNewFile,BufRead *pentadactylrc*,*.penta set filetype=pentadactyl diff --git a/pentadactyl/contrib/vim/syntax/pentadactyl.vim b/pentadactyl/contrib/vim/syntax/pentadactyl.vim index bf7dafaa..cbcd2ea8 100644 --- a/pentadactyl/contrib/vim/syntax/pentadactyl.vim +++ b/pentadactyl/contrib/vim/syntax/pentadactyl.vim @@ -71,7 +71,7 @@ syn match pentadactylOption "\<\%(no\|inv\)\=\%(smartcase\|scs\|strictfocus\|sf\ syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained syn region pentadactylJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline -syn region pentadactylJavaScript matchgroup=pentadactylJavascriptDelimiter +syn region pentadactylJavaScript matchgroup=pentadactylJavaScriptDelimiter \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<=' @@ -86,14 +86,14 @@ syn keyword pentadactylTodo FIXME NOTE TODO XXX contained syn region pentadactylString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline -syn match pentadactylLineComment +^\s*".*$+ contains=pentadactylTodo,@Spell +syn match pentadactylLineComment +^\s*".*$+ contains=pentadactylTodo,@Spell " NOTE: match vim.vim highlighting group names hi def link pentadactylAutoCmd pentadactylCommand hi def link pentadactylAutoEvent Type hi def link pentadactylCommand Statement hi def link pentadactylComment Comment -hi def link pentadactylJavascriptDelimiter Delimiter +hi def link pentadactylJavaScriptDelimiter Delimiter hi def link pentadactylCssDelimiter Delimiter hi def link pentadactylNotation Special hi def link pentadactylLineComment Comment diff --git a/teledactyl/contrib/vim/ftdetect/muttator.vim b/teledactyl/contrib/vim/ftdetect/muttator.vim deleted file mode 100644 index 391e6b6a..00000000 --- a/teledactyl/contrib/vim/ftdetect/muttator.vim +++ /dev/null @@ -1,2 +0,0 @@ -" TODO: what's the Muttator filename extension? -au BufNewFile,BufRead *muttatorrc*,*.muttator set filetype=muttator diff --git a/teledactyl/contrib/vim/ftdetect/teledactyl.vim b/teledactyl/contrib/vim/ftdetect/teledactyl.vim new file mode 100644 index 00000000..f4a303bb --- /dev/null +++ b/teledactyl/contrib/vim/ftdetect/teledactyl.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead *teledactylrc*,*.tele set filetype=teledactyl diff --git a/teledactyl/contrib/vim/syntax/muttator.vim b/teledactyl/contrib/vim/syntax/muttator.vim deleted file mode 100644 index a96ea81f..00000000 --- a/teledactyl/contrib/vim/syntax/muttator.vim +++ /dev/null @@ -1,103 +0,0 @@ -" Vim syntax file -" Language: Muttator configuration file -" Maintainer: Doug Kearns -" Last Change: 2009 Aug 27 - -" TODO: make this muttator specific - shared dactyl config? - -if exists("b:current_syntax") - finish -endif - -let s:cpo_save = &cpo -set cpo&vim - -syn include @javascriptTop syntax/javascript.vim -unlet b:current_syntax - -syn include @cssTop syntax/css.vim -unlet b:current_syntax - -syn match muttatorCommandStart "\%(^\s*:\=\)\@<=" nextgroup=muttatorCommand,muttatorAutoCmd - -syn keyword muttatorCommand ab[breviate] ab[clear] addo[ns] addr[essbook] bN[ext] bd[elete] beep bf[irst] bl[ast] bn[ext] - \ bp[revious] br[ewind] bufd[o] bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear] cno[remap] - \ colo[rscheme] com[mand] comc[lear] con[tact] contacts copy[to] cu[nmap] cuna[bbrev] delc[ommand] delm[arks] delmac[ros] - \ dels[tyle] dia[log] do[autocmd] doautoa[ll] ec[ho] echoe[rr] echom[sg] em[enu] empty[trash] exe[cute] exta[dd] extd[isable] - \ extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exu[sage] fini[sh] frameo[nly] get[messages] go[to] - \ h[elp] helpa[ll] ha[rdcopy] hi[ghlight] ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] iuna[bbrev] javas[cript] - \ js let loadplugins lpl m[ail] ma[rk] macros map mapc[lear] marks mes[sages] messc[lear] mkm[uttatorrc] mm[ap] mmapc[lear] - \ mno[remap] move[to] mu[nmap] nm[ap] nmapc[lear] nno[remap] no[remap] norm[al] nu[nmap] optionu[sage] pa[geinfo] pagest[yle] - \ pas pref[erences] prefs pw[d] q[uit] re[load] res[tart] run runt[ime] sav[eas] scrip[tnames] se[t] setg[lobal] - \ setl[ocal] sil[ent] so[urce] st[op] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabfir[st] tabl[ast] tabn[ext] - \ tabp[revious] tabr[ewind] tbh[ide] tbs[how] tbt[oggle] time tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] - \ una[bbreviate] unl[et] unm[ap] verb[ose] ve[rsion] vie[wsource] viu[sage] vm[ap] vmapc[lear] vno[remap] vu[nmap] w[rite] zo[om] - \ contained - -syn match muttatorCommand "!" contained - -syn keyword muttatorAutoCmd au[tocmd] contained nextgroup=muttatorAutoEventList skipwhite - -syn keyword muttatorAutoEvent FolderLoad PageLoadPre PageLoad ShellCmdPost muttatorEnter muttatorLeavePre muttatorLeave - \ contained - -syn match muttatorAutoEventList "\(\a\+,\)*\a\+" contained contains=muttatorAutoEvent - -syn region muttatorSet matchgroup=muttatorCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>" - \ end="$" keepend oneline contains=muttatorOption,muttatorString - -syn keyword muttatorOption archivefolder cdpath cd complete cpt editor eventignore ei extendedhinttags eht fileencoding fenc - \ followhints fh guioptions go helpfile hf hintinputs hin hintmatching hm hinttags ht hinttimeout hto history hi laststatus ls - \ layout maxitems messages msgs nextpattern pageinfo pa previouspattern runtimepath rtp scroll scr shell sh shellcmdflag shcf - \ showstatuslinks ssli showtabline stal smtpserver smtp suggestengines titlestring urlseparator verbose vbs wildcase wic - \ wildignore wig wildmode wim wildoptions wop wordseparators wsp - \ contained nextgroup=muttatorSetMod - -" toggle options -syn match muttatorOption "\<\%(no\|inv\)\=\%(autoexternal\|errorbells\|eb\|exrc\|ex\|focuscontent\|fc\|fullscreen\|fs\)\>!\=" - \ contained nextgroup=muttatorSetMod -syn match muttatorOption "\<\%(no\|inv\)\=\%(insertmode\|im\|loadplugins\|lpl\|more\|online\|showmode\|smd\|visualbell\|vb\)\>!\=" - \ contained nextgroup=muttatorSetMod -syn match muttatorOption "\<\%(no\|inv\)\=\%(usermode\|um\)\>!\=" - \ contained nextgroup=muttatorSetMod - -syn match muttatorSetMod "\%(\<[a-z_]\+\)\@<=&" contained - -syn region muttatorJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline -syn region muttatorJavaScript matchgroup=muttatorJavascriptDelimiter - \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold - -let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<=' -execute 'syn region muttatorCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline' -execute 'syn region muttatorCss matchgroup=muttatorCssDelimiter' - \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold' - -syn match muttatorNotation "<[0-9A-Za-z-]\+>" - -syn match muttatorComment +".*$+ contains=muttatorTodo,@Spell -syn keyword muttatorTodo FIXME NOTE TODO XXX contained - -syn region muttatorString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline - -syn match muttatorLineComment +^\s*".*$+ contains=muttatorTodo,@Spell - -" NOTE: match vim.vim highlighting group names -hi def link muttatorAutoCmd muttatorCommand -hi def link muttatorAutoEvent Type -hi def link muttatorCommand Statement -hi def link muttatorComment Comment -hi def link muttatorJavascriptDelimiter Delimiter -hi def link muttatorCssDelimiter Delimiter -hi def link muttatorNotation Special -hi def link muttatorLineComment Comment -hi def link muttatorOption PreProc -hi def link muttatorSetMod muttatorOption -hi def link muttatorString String -hi def link muttatorTodo Todo - -let b:current_syntax = "muttator" - -let &cpo = s:cpo_save -unlet s:cpo_save - -" vim: tw=130 et ts=4 sw=4: diff --git a/teledactyl/contrib/vim/syntax/teledactyl.vim b/teledactyl/contrib/vim/syntax/teledactyl.vim new file mode 100644 index 00000000..44746e09 --- /dev/null +++ b/teledactyl/contrib/vim/syntax/teledactyl.vim @@ -0,0 +1,107 @@ +" Vim syntax file +" Language: Teledactyl configuration file +" Maintainer: Doug Kearns + +" TODO: make this teledactyl specific - shared dactyl config? + +if exists("b:current_syntax") + finish +endif + +let s:cpo_save = &cpo +set cpo&vim + +syn include @javascriptTop syntax/javascript.vim +unlet b:current_syntax + +syn include @cssTop syntax/css.vim +unlet b:current_syntax + +syn match teledactylCommandStart "\%(^\s*:\=\)\@<=" nextgroup=teledactylCommand,teledactylAutoCmd + +syn keyword teledactylCommand ab[breviate] ab[clear] addo[ns] addr[essbook] bN[ext] bd[elete] beep bf[irst] bl[ast] bn[ext] + \ bp[revious] br[ewind] bufd[o] bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear] cno[remap] + \ colo[rscheme] com[mand] comc[lear] contexts con[tact] contacts copy[to] cu[nmap] cuna[bbrev] delc[ommand] delm[arks] + \ delmac[ros] dels[tyle] dia[log] do[autocmd] doautoa[ll] ec[ho] echoe[rr] echom[sg] em[enu] empty[trash] exe[cute] exta[dd] + \ extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exts exu[sage] fini[sh] frameo[nly] + \ get[messages] go[to] h[elp] helpa[ll] ha[rdcopy] hi[ghlight] ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] iu[nmap] + \ iuna[bbrev] javas[cript] js keepa[lt] let loadplugins lpl m[ail] ma[rk] macros map mapc[lear] marks mes[sages] messc[lear] + \ mkt[eledactylrc] mm[ap] mmapc[lear] mno[remap] move[to] mu[nmap] nm[ap] nmapc[lear] nno[remap] noh[lsearch] no[remap] + \ norm[al] nu[nmap] optionu[sage] pa[geinfo] pagest[yle] pas pref[erences] prefs pw[d] q[uit] re[load] res[tart] run + \ runt[ime] sav[eas] scrip[tnames] se[t] setg[lobal] setl[ocal] sil[ent] so[urce] st[op] sty[le] styd[isable] + \ styled[isable] stye[nable] stylee[nable] styt[oggle] stylet[oggle] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] + \ tabfir[st] tabl[ast] tabn[ext] tabp[revious] tabr[ewind] tbh[ide] tbs[how] tbt[oggle] time tn[ext] toolbarh[ide] + \ toolbars[how] toolbart[oggle] tp[revious] una[bbreviate] unl[et] unm[ap] verb[ose] ve[rsion] vie[wsource] viu[sage] vm[ap] + \ vmapc[lear] vno[remap] vu[nmap] w[rite] zo[om] + \ contained + +syn match teledactylCommand "!" contained + +syn keyword teledactylAutoCmd au[tocmd] contained nextgroup=teledactylAutoEventList skipwhite +syn keyword teledactylAutoEvent DOMLoad FolderLoad PageLoadPre PageLoad Enter Leave LeavePre contained + +syn match teledactylAutoEventList "\(\a\+,\)*\a\+" contained contains=teledactylAutoEvent + +syn region teledactylSet matchgroup=teledactylCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>" + \ end="$" keepend oneline contains=teledactylOption,teledactylString + +syn keyword teledactylOption altwildmode awim archivefolder autocomplete au banghist bh cdpath cd complete cpt editor + \ eventignore ei extendedhinttags eht fileencoding fenc followhints fh guioptions go helpfile hf hintinputs hin hintkeys hk + \ hintmatching hm hinttags ht hinttimeout hto history hi laststatus ls layout maxitems messages msgs nextpattern pageinfo pa + \ previouspattern runtimepath rtp scroll scr shell sh shellcmdflag shcf showstatuslinks ssli showtabline stal smtpserver smtp + \ suggestengines titlestring urlseparator verbose vbs wildanchor wia wildcase wic wildignore wig wildmode wim wildoptions wop + \ wildsort wis wordseparators wsp + \ contained nextgroup=teledactylSetMod + +" toggle options +syn match teledactylOption "\<\%(no\|inv\)\=\%(autoexternal\|errorbells\|eb\|exrc\|ex\|focuscontent\|fc\|fullscreen\|fs\)\>!\=" + \ contained nextgroup=teledactylSetMod +syn match teledactylOption "\<\%(no\|inv\)\=\%(hlsearch\|hls\|ignorecase\|ic\|incsearch\|is\|insertmode\|im\)\>!\=" + \ contained nextgroup=teledactylSetMod +syn match teledactylOption "\<\%(no\|inv\)\=\%(jsdebugger\|jsd\|linksearch\|lks\|loadplugins\|lpl\|more\|online\)\>!\=" + \ contained nextgroup=teledactylSetMod +syn match teledactylOption "\<\%(no\|inv\)\=\%(showmode\|smd\|smartcase\|scs\|strictfocus\|sf\|usermode\|um\)\>!\=" + \ contained nextgroup=teledactylSetMod +syn match teledactylOption "\<\%(no\|inv\)\=\%(visualbell\|vb\)\>!\=" + \ contained nextgroup=teledactylSetMod + +syn match teledactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained + +syn region teledactylJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline +syn region teledactylJavaScript matchgroup=teledactylJavaScriptDelimiter + \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold + +let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<=' +execute 'syn region teledactylCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline' +execute 'syn region teledactylCss matchgroup=teledactylCssDelimiter' + \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold' + +syn match teledactylNotation "<[0-9A-Za-z-]\+>" + +syn match teledactylComment +".*$+ contains=teledactylTodo,@Spell +syn keyword teledactylTodo FIXME NOTE TODO XXX contained + +syn region teledactylString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline + +syn match teledactylLineComment +^\s*".*$+ contains=teledactylTodo,@Spell + +" NOTE: match vim.vim highlighting group names +hi def link teledactylAutoCmd teledactylCommand +hi def link teledactylAutoEvent Type +hi def link teledactylCommand Statement +hi def link teledactylComment Comment +hi def link teledactylJavaScriptDelimiter Delimiter +hi def link teledactylCssDelimiter Delimiter +hi def link teledactylNotation Special +hi def link teledactylLineComment Comment +hi def link teledactylOption PreProc +hi def link teledactylSetMod teledactylOption +hi def link teledactylString String +hi def link teledactylTodo Todo + +let b:current_syntax = "teledactyl" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: tw=130 et ts=4 sw=4: diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/xulmus/contrib/vim/syntax/xulmus.vim index 41f1d991..5f3bba1f 100644 --- a/xulmus/contrib/vim/syntax/xulmus.vim +++ b/xulmus/contrib/vim/syntax/xulmus.vim @@ -72,7 +72,7 @@ syn match xulmusOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\ syn match xulmusSetMod "\%(\<[a-z_]\+\)\@<=&" contained syn region xulmusJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline -syn region xulmusJavaScript matchgroup=xulmusJavascriptDelimiter +syn region xulmusJavaScript matchgroup=xulmusJavaScriptDelimiter \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<=' @@ -94,7 +94,7 @@ hi def link xulmusAutoCmd xulmusCommand hi def link xulmusAutoEvent Type hi def link xulmusCommand Statement hi def link xulmusComment Comment -hi def link xulmusJavascriptDelimiter Delimiter +hi def link xulmusJavaScriptDelimiter Delimiter hi def link xulmusCssDelimiter Delimiter hi def link xulmusNotation Special hi def link xulmusLineComment Comment