From 0a0bd4560177dd8a89c3978dee0c61dd8dd0a932 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Fri, 10 Sep 2010 17:52:52 +1000 Subject: [PATCH] PD Vim syntax file update Delivered-To: maglione.k@gmail.com Received: by 10.216.136.214 with SMTP id w64cs2667wei; Fri, 10 Sep 2010 00:53:12 -0700 (PDT) Return-Path: Received-SPF: pass (google.com: domain of dougkearns@gmail.com designates 10.227.138.146 as permitted sender) client-ip=10.227.138.146; Authentication-Results: mr.google.com; spf=pass (google.com: domain of dougkearns@gmail.com designates 10.227.138.146 as permitted sender) smtp.mail=dougkearns@gmail.com; dkim=pass header.i=dougkearns@gmail.com Received: from mr.google.com ([10.227.138.146]) by 10.227.138.146 with SMTP id a18mr590354wbu.151.1284105192263 (num_hops = 1); Fri, 10 Sep 2010 00:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=8pQUW5WLnsK61m2IZPWOnOPaQlu/k2jhkbbOFOecr2A=; b=W/+613sGtVKvI12FR9kJjsK4c4c2tUpTk9WgTdUFhFXItgDA8yaTCnb2zrzYbn+ReP yXyrVWu+fFAeNQKtk3afP+gKh9HlCNufq6UIoLRk9k2jwCsIoUO75FXbSk7MXL4Q1G2y NYDYeWNUccCowS2PRPiHgM0Vt+Af0nU/tM6T4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=w4FhoErEFuUuIoaJOAnwhJjs1flQd2Yz5nkbRlPcLLhMm0qhUMg62PJ7uMCsJv9mdr +nGqpFplrRmAhsU2KTAf1k8vqJ+SWYNnSpE+axoyUFCZ+Xc9OfvWvsVF8cVg46wmkUKF y6uJJYEoMmpAfYQeX7rchyTlGhU9g7Mm2YZUk= Received: by 10.227.138.146 with SMTP id a18mr590354wbu.151.1284105192249; Fri, 10 Sep 2010 00:53:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.227.135.131 with HTTP; Fri, 10 Sep 2010 00:52:52 -0700 (PDT) Message-ID: To: Kris Maglione Content-Type: multipart/mixed; boundary=00163645735ad6998c048fe309e3 --- common/locale/en-US/starting.xml | 4 +-- .../contrib/vim/syntax/pentadactyl.vim | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml index 89b2fa16..c0c08a2b 100644 --- a/common/locale/en-US/starting.xml +++ b/common/locale/en-US/starting.xml @@ -147,8 +147,8 @@

Saving settings

- :mkv :mk&dactyl.name;rc - :mkvimperatorrc! file + :mkp :mk&dactyl.name;rc + :mkpentadactylrc! file

Write current key mappings and changed options to file. If no diff --git a/pentadactyl/contrib/vim/syntax/pentadactyl.vim b/pentadactyl/contrib/vim/syntax/pentadactyl.vim index fee9c52a..0e2fe9d9 100644 --- a/pentadactyl/contrib/vim/syntax/pentadactyl.vim +++ b/pentadactyl/contrib/vim/syntax/pentadactyl.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Pentadactyl configuration file " Maintainer: Doug Kearns -" Last Change: 2009 Nov 14 +" Last Change: 2010 Sep 10 " TODO: make this pentadactyl specific - shared dactyl config? @@ -22,12 +22,12 @@ syn match pentadactylCommandStart "\%(^\s*:\=\)\@<=" nextgroup=pentadactylComman syn keyword pentadactylCommand 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] 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] cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros] + \ 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] mkv[imperatorrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage] + \ 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] @@ -43,7 +43,7 @@ syn match pentadactylCommand "!" contained syn keyword pentadactylAutoCmd au[tocmd] contained nextgroup=pentadactylAutoEventList skipwhite syn keyword pentadactylAutoEvent BookmarkAdd ColorSheme DOMLoad DownloadPost Fullscreen LocationChange PageLoadPre PageLoad - \ PrivateMode Sanitize ShellCmdPost VimperatorEnter VimperatorLeavePre VimperatorLeave + \ PrivateMode Sanitize ShellCmdPost Enter LeavePre Leave \ contained syn match pentadactylAutoEventList "\(\a\+,\)*\a\+" contained contains=pentadactylAutoEvent @@ -51,22 +51,22 @@ 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 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 showtabline ssli - \ stal suggestengines titlestring urlseparator vbs verbose wic wig wildcase wildignore wildmode wildoptions wim wop - \ wordseparators wsp +syn keyword pentadactylOption act activate 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 + \ showtabline ssli stal suggestengines titlestring urlseparator vbs verbose wic wig wildcase wildignore wildmode wildoptions + \ wildsort wim wis wop wordseparators wsp \ contained nextgroup=pentadactylSetMod " toggle options -syn match pentadactylOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|focuscontent\|fc\|fullscreen\|fs\|ignorecase\|ic\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|fullscreen\|fs\|ignorecase\|ic\)\>!\=" \ contained nextgroup=pentadactylSetMod -syn match pentadactylOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|linksearch\|lks\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|jsd\|jsdebugger\)\>!\=" \ contained nextgroup=pentadactylSetMod -syn match pentadactylOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|private\|showmode\|smd\|smartcase\|scs\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(linksearch\|lks\|loadplugins\|lpl\|more\|online\|private\|showmode\|smd\)\>!\=" \ contained nextgroup=pentadactylSetMod -syn match pentadactylOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\)\>!\=" +syn match pentadactylOption "\<\%(no\|inv\)\=\%(smartcase\|scs\|strictfocus\|online\|visualbell\|vb\|usermode\|um\)\>!\=" \ contained nextgroup=pentadactylSetMod syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained