From 10d6a225184715aa8f35b052315644a0943c3732 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 20 Sep 2010 21:46:47 +1000 Subject: [PATCH] Update Pentadactyl related Vim runtime files. --- .../contrib/vim/ftdetect/pentadactyl.vim | 2 +- .../contrib/vim/syntax/pentadactyl.vim | 35 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim b/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim index c1db494d..146bab18 100644 --- a/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim +++ b/pentadactyl/contrib/vim/ftdetect/pentadactyl.vim @@ -1 +1 @@ -au BufNewFile,BufRead *pentadactylrc*,*.vimp set filetype=pentadactyl +au BufNewFile,BufRead *pentadactylrc* set filetype=pentadactyl diff --git a/pentadactyl/contrib/vim/syntax/pentadactyl.vim b/pentadactyl/contrib/vim/syntax/pentadactyl.vim index 0e2fe9d9..b7468a8b 100644 --- a/pentadactyl/contrib/vim/syntax/pentadactyl.vim +++ b/pentadactyl/contrib/vim/syntax/pentadactyl.vim @@ -1,7 +1,6 @@ " Vim syntax file " Language: Pentadactyl configuration file " Maintainer: Doug Kearns -" Last Change: 2010 Sep 10 " TODO: make this pentadactyl specific - shared dactyl config? @@ -24,18 +23,18 @@ syn keyword pentadactylCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] \ bmarks bn[ext] bp[revious] br[ewind] bufd[o] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear] \ cno[remap] colo[rscheme] com[mand] comc[lear] contexts cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros] \ delqm[arks] dels[tyle] dia[log] dl do[autocmd] doautoa[ll] downl[oads] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute] - \ exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exu[sage] files fini[sh] fo[rward] - \ frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap] - \ iu[nmap] iuna[bbrev] javas[cript] js ju[mps] keepa[lt] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks mes[sages] - \ messc[lear] mkp[entadactylrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] - \ pa[geinfo] pagest[yle] pas pl[ay] pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] re[load] - \ reloada[ll] res[tart] run runt[ime] sa[nitize] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] - \ sideb[ar] sil[ent] so[urce] st[op] stopa[ll] sty[le] styd[isable] styled[isable] stye[nable] stylee[nable] styt[oggle] - \ stylet[oggle] tN[ext] t[open] tab taba[ttach] tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] tabfir[st] tabl[ast] - \ tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] tbt[oggle] time tn[ext] - \ toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] verb[ose] ve[rsion] - \ vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] winc[lose] wind[ow] winon[ly] - \ wo[pen] wq wqa[ll] xa[ll] zo[om] + \ exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exts exu[sage] files fini[sh] + \ fo[rward] frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] + \ ino[remap] iu[nmap] iuna[bbrev] javas[cript] js ju[mps] keepa[lt] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks + \ mes[sages] messc[lear] mkp[entadactylrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] + \ optionu[sage] pa[geinfo] pagest[yle] pas pl[ay] pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] + \ re[load] reloada[ll] res[tart] run runt[ime] sa[nitize] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] + \ setl[ocal] sideb[ar] sil[ent] so[urce] st[op] stopa[ll] sty[le] styd[isable] styled[isable] stye[nable] stylee[nable] + \ styt[oggle] stylet[oggle] tN[ext] t[open] tab taba[ttach] tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] tabfir[st] + \ tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] tbt[oggle] time + \ tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] verb[ose] + \ ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] winc[lose] wind[ow] + \ winon[ly] wo[pen] wq wqa[ll] xa[ll] zo[om] \ contained syn match pentadactylCommand "!" contained @@ -51,7 +50,7 @@ syn match pentadactylAutoEventList "\(\a\+,\)*\a\+" contained contains=pentadact syn region pentadactylSet matchgroup=pentadactylCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>" \ end="$" keepend oneline contains=pentadactylOption,pentadactylString -syn keyword pentadactylOption act activate au autocomplete cd cdpath complete cpt defsearch ds editor eht ei enc encoding +syn keyword pentadactylOption act activate altwildmode awim au autocomplete cd cdpath complete cpt defsearch ds editor eht ei enc encoding \ eventignore extendedhinttags fenc fileencoding fh followhints go guioptions helpfile hf hi hin hintinputs hintmatching \ hinttags hinttimeout history hm ht hto laststatus ls maxitems messages msgs newtab nextpattern pa pageinfo popups pps \ previouspattern rtp runtimepath si sanitizeitems sts sanitizetimespan scr scroll sh shcf shell shellcmdflag showstatuslinks @@ -60,13 +59,15 @@ syn keyword pentadactylOption act activate au autocomplete cd cdpath complete cp \ contained nextgroup=pentadactylSetMod " toggle options -syn match pentadactylOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|fullscreen\|fs\|ignorecase\|ic\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(banghist\|bh\|errorbells\|eb\|exrc\|ex\|fullscreen\|fs\|ignorecase\|ic\)\>!\=" \ contained nextgroup=pentadactylSetMod syn match pentadactylOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|jsd\|jsdebugger\)\>!\=" \ contained nextgroup=pentadactylSetMod -syn match pentadactylOption "\<\%(no\|inv\)\=\%(linksearch\|lks\|loadplugins\|lpl\|more\|online\|private\|showmode\|smd\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(linksearch\|lks\|loadplugins\|lpl\|more\|online\|pornmode\|private\)\>!\=" \ contained nextgroup=pentadactylSetMod -syn match pentadactylOption "\<\%(no\|inv\)\=\%(smartcase\|scs\|strictfocus\|online\|visualbell\|vb\|usermode\|um\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(showmode\|smd\|smartcase\|scs\|strictfocus\|sf\|online\|visualbell\|vb\)\>!\=" + \ contained nextgroup=pentadactylSetMod +syn match pentadactylOption "\<\%(no\|inv\)\=\%(usermode\|um\)\>!\=" \ contained nextgroup=pentadactylSetMod syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained