From ee3b58f41ff1361e19bc434d9d2f8f8009d45729 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 16 Mar 2009 16:41:07 +1100 Subject: [PATCH] Begin updating Vim runtime files for xulmus. --- xulmus/contrib/vim/Makefile | 4 +- xulmus/contrib/vim/ftdetect/vimperator.vim | 1 - xulmus/contrib/vim/mkvimball.txt | 4 +- xulmus/contrib/vim/syntax/vimperator.vim | 104 ------------------ ...{vimperatorrc.example => xulmusrc.example} | 4 +- 5 files changed, 6 insertions(+), 111 deletions(-) delete mode 100755 xulmus/contrib/vim/ftdetect/vimperator.vim delete mode 100755 xulmus/contrib/vim/syntax/vimperator.vim rename xulmus/{vimperatorrc.example => xulmusrc.example} (88%) diff --git a/xulmus/contrib/vim/Makefile b/xulmus/contrib/vim/Makefile index e2f716f5..cbbbe046 100755 --- a/xulmus/contrib/vim/Makefile +++ b/xulmus/contrib/vim/Makefile @@ -1,6 +1,6 @@ -VIMBALL = vimperator.vba +VIMBALL = xulmus.vba -vimball: mkvimball.txt syntax/vimperator.vim ftdetect/vimperator.vim +vimball: mkvimball.txt syntax/xulmus.vim ftdetect/xulmus.vim -echo '%MkVimball! ${VIMBALL} .' | vim -u NORC -N -e -s mkvimball.txt all: vimball diff --git a/xulmus/contrib/vim/ftdetect/vimperator.vim b/xulmus/contrib/vim/ftdetect/vimperator.vim deleted file mode 100755 index cbf9068e..00000000 --- a/xulmus/contrib/vim/ftdetect/vimperator.vim +++ /dev/null @@ -1 +0,0 @@ -au BufNewFile,BufRead *vimperatorrc*,*.vimp set filetype=vimperator diff --git a/xulmus/contrib/vim/mkvimball.txt b/xulmus/contrib/vim/mkvimball.txt index 96d1629b..3b0b3ed3 100755 --- a/xulmus/contrib/vim/mkvimball.txt +++ b/xulmus/contrib/vim/mkvimball.txt @@ -1,2 +1,2 @@ -syntax/vimperator.vim -ftdetect/vimperator.vim +syntax/xulmus.vim +ftdetect/xulmus.vim diff --git a/xulmus/contrib/vim/syntax/vimperator.vim b/xulmus/contrib/vim/syntax/vimperator.vim deleted file mode 100755 index aebd6fc1..00000000 --- a/xulmus/contrib/vim/syntax/vimperator.vim +++ /dev/null @@ -1,104 +0,0 @@ -" Vim syntax file -" Language: VIMperator configuration file -" Maintainer: Doug Kearns -" Last Change: 2009 Feb 19 - -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 vimperatorCommandStart "\%(^\s*:\=\)\@<=" nextgroup=vimperatorCommand,vimperatorAutoCmd - -syn keyword vimperatorCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] ba[ck] bd[elete] beep bf[irst] bl[ast] bma[rk] - \ bmarks bn[ext] bp[revious] br[ewind] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear] - \ cno[remap] colo[rscheme] com[mand] comc[lear] 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] e[dit] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute] - \ exu[sage] files fini[sh] fo[rward] fw h[elp] 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] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks mes[sages] - \ mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen] optionu[sage] pa[geinfo] pagest[yle] pc[lose] 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] sav[eas] sb[ar] - \ sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] sideb[ar] so[urce] st[op] sty[le] tN[ext] t[open] tab - \ tabN[ext] tabc[lose] tabd[uplicate] tabde[tach] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen - \ tabp[revious] tabr[ewind] tabs time tn[ext] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] ve[rsion] - \ vie[wsource] viu[sage] w[rite] wc[lose] win[open] winc[lose] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] - \ contained - -syn match vimperatorCommand "!" contained - -syn keyword vimperatorAutoCmd au[tocmd] contained nextgroup=vimperatorAutoEventList skipwhite - -syn keyword vimperatorAutoEvent BookmarkAdd DOMLoad LocationChange PageLoadPre PageLoad ShellCmdPost VimperatorEnter - \ VimperatorLeavePre VimperatorLeave - \ contained - -syn match vimperatorAutoEventList "\(\a\+,\)*\a\+" contained contains=vimperatorAutoEvent - -syn region vimperatorSet matchgroup=vimperatorCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>" - \ end="$" keepend oneline contains=vimperatorOption,vimperatorString - -syn keyword vimperatorOption activate act cdpath cd complete cpt defsearch ds editor eventignore ei extendedhinttags eht - \ followhints fh guioptions go helpfile hf hintmatching hm hinttags ht hinttimeout hto history hi laststatus ls messages msgs - \ newtab nextpattern pageinfo pa popups pps previouspattern runtimepath rtp scroll scr shell sh shellcmdflag shcf - \ showstatuslinks ssli showtabline stal suggestengines titlestring urlseparator verbose vbs wildcase wic wildignore wig - \ wildmode wim wildoptions wop wordseparators wsp - \ contained nextgroup=vimperatorSetMod - -" toggle options -syn match vimperatorOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|focuscontent\|fc\|fullscreen\|fs\|ignorecase\|ic\)\>!\=" - \ contained nextgroup=vimperatorSetMod -syn match vimperatorOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|linksearch\|lks\)\>!\=" - \ contained nextgroup=vimperatorSetMod -syn match vimperatorOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|preload\|showmode\|smd\|smartcase\|scs\)\>!\=" - \ contained nextgroup=vimperatorSetMod -syn match vimperatorOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\)\>!\=" - \ contained nextgroup=vimperatorSetMod - -syn match vimperatorSetMod "\%(\<[a-z_]\+\)\@<=&" contained - -syn region vimperatorJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline -syn region vimperatorJavaScript matchgroup=vimperatorJavascriptDelimiter - \ 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 vimperatorCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline' -execute 'syn region vimperatorCss matchgroup=vimperatorCssDelimiter' - \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold' - -syn match vimperatorNotation "<[0-9A-Za-z-]\+>" - -syn match vimperatorComment +".*$+ contains=vimperatorTodo,@Spell -syn keyword vimperatorTodo FIXME NOTE TODO XXX contained - -syn region vimperatorString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline - -syn match vimperatorLineComment +^\s*".*$+ contains=vimperatorTodo,@Spell - -" NOTE: match vim.vim highlighting group names -hi def link vimperatorAutoCmd vimperatorCommand -hi def link vimperatorAutoEvent Type -hi def link vimperatorCommand Statement -hi def link vimperatorComment Comment -hi def link vimperatorJavascriptDelimiter Delimiter -hi def link vimperatorCssDelimiter Delimiter -hi def link vimperatorNotation Special -hi def link vimperatorLineComment Comment -hi def link vimperatorOption PreProc -hi def link vimperatorSetMod vimperatorOption -hi def link vimperatorString String -hi def link vimperatorTodo Todo - -let b:current_syntax = "vimperator" - -let &cpo = s:cpo_save -unlet s:cpo_save - -" vim: tw=130 et ts=4 sw=4: diff --git a/xulmus/vimperatorrc.example b/xulmus/xulmusrc.example similarity index 88% rename from xulmus/vimperatorrc.example rename to xulmus/xulmusrc.example index 1991c4c4..221e7490 100755 --- a/xulmus/vimperatorrc.example +++ b/xulmus/xulmusrc.example @@ -16,6 +16,6 @@ hello = function(name) } EOF -echo "vimperatorrc sourced" +echo "xulmusrc sourced" -" vim: ft=vimperator: +" vim: ft=xulmus: