From e57f63ff10e7467a8bae615ee06e87568cffb2d9 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 1 Jul 2009 18:54:26 +1000 Subject: [PATCH] Fix clashing shortnames for :tabdo and :tabduplicate. Fixes #312 (tabd completion changed). --- common/content/tabs.js | 2 +- vimperator/contrib/vim/syntax/vimperator.vim | 4 ++-- vimperator/locale/en-US/tabs.txt | 4 ++-- xulmus/contrib/vim/syntax/xulmus.vim | 4 ++-- xulmus/locale/en-US/tabs.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/content/tabs.js b/common/content/tabs.js index 6399b0a7..6d329a72 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -588,7 +588,7 @@ function Tabs() //{{{ function () { tabs.detachTab(null); }, { argCount: "0" }); - commands.add(["tabd[uplicate]"], + commands.add(["tabdu[plicate]"], "Duplicate current tab", function (args) { diff --git a/vimperator/contrib/vim/syntax/vimperator.vim b/vimperator/contrib/vim/syntax/vimperator.vim index 9573ecae..6f68d175 100644 --- a/vimperator/contrib/vim/syntax/vimperator.vim +++ b/vimperator/contrib/vim/syntax/vimperator.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: VIMperator configuration file " Maintainer: Doug Kearns -" Last Change: 2009 May 22 +" Last Change: 2009 Jul 1 if exists("b:current_syntax") finish @@ -28,7 +28,7 @@ syn keyword vimperatorCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] b \ optionu[sage] messc[lear] pa[geinfo] pagest[yle] pas 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] sil[ent] so[urce] st[op] stopa[ll] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] - \ tabd[uplicate] tabde[tach] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] + \ tabdu[plicate] 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] \ vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] winc[lose] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om] \ contained diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index dd625c57..c06cebe6 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -29,8 +29,8 @@ support it, currently: ________________________________________________________________________________ -|:tabd| |:tabduplicate| -||:[count]tab[duplicate]|| + +|:tabdu| |:tabduplicate| +||:[count]tabdu[plicate]|| + ________________________________________________________________________________ Duplicate the current tab and switch to the duplicate. If [count] is given, duplicate the tab [count] times. diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/xulmus/contrib/vim/syntax/xulmus.vim index 6889b25a..5d92c140 100644 --- a/xulmus/contrib/vim/syntax/xulmus.vim +++ b/xulmus/contrib/vim/syntax/xulmus.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: xulmus configuration file " Maintainer: Doug Kearns -" Last Change: 2009 Mar 16 +" Last Change: 2009 Jul 1 " TODO: make this xulmus specific @@ -29,7 +29,7 @@ syn keyword xulmusCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] ba[ck \ 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 + \ tabN[ext] tabc[lose] tabdu[plicate] 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 diff --git a/xulmus/locale/en-US/tabs.txt b/xulmus/locale/en-US/tabs.txt index 545e7fc4..c25a0a21 100644 --- a/xulmus/locale/en-US/tabs.txt +++ b/xulmus/locale/en-US/tabs.txt @@ -29,8 +29,8 @@ support it, currently: ________________________________________________________________________________ -|:tabd| |:tabduplicate| -||:[count]tab[duplicate]|| + +|:tabdu| |:tabduplicate| +||:[count]tabdu[plicate]|| + ________________________________________________________________________________ Duplicate the current tab and switch to the duplicate. If [count] is given, duplicate the tab [count] times.