From 1f7b6f4b0564454409e91eccccf6e5f819f9a704 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 11 Jul 2009 00:03:28 +1000 Subject: [PATCH] Make :open behaviour match that of :tabopen/:winopen. --- common/content/browser.js | 11 +++++------ vimperator/NEWS | 2 ++ vimperator/locale/en-US/browsing.txt | 4 +--- xulmus/locale/en-US/browsing.txt | 4 +--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/common/content/browser.js b/common/content/browser.js index 05b8f1eb..a1ef083d 100644 --- a/common/content/browser.js +++ b/common/content/browser.js @@ -255,15 +255,14 @@ function Browser() //{{{ "Open one or more URLs in the current tab", function (args) { - if (args.string) - liberator.open(args.string); - else if (args.bang) - BrowserReloadSkipCache(); + args = args.string; + + if (args) + liberator.open(args); else - BrowserReload(); + liberator.open("about:blank"); }, { - bang: true, completer: function (context) completion.url(context), literal: 0 }); diff --git a/vimperator/NEWS b/vimperator/NEWS index de930eb3..2191ad99 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -14,6 +14,8 @@ * IMPORTANT: shifted key notation now matches Vim's behaviour. E.g. and are equivalent, to map the uppercase character use . + * make :open behavior match that of :tabopen and :winopen when no argument + is specified * add extension related commands - :extadd, :extdelete, :extdisable, :extenable, :extensions, :extoptions * add '-javascript' flag to :autocommand diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index e32a072a..e3137cd9 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -28,7 +28,7 @@ ________________________________________________________________________________ section:Opening{nbsp}web{nbsp}pages[opening] |o| |:o| |:open| -||:o[pen][!] [a][arg1][a], [a][arg2][a], ...|| + +||:o[pen] [a][arg1][a], [a][arg2][a], ...|| + ||o|| ________________________________________________________________________________ Open one or more URLs in the current tab. @@ -59,8 +59,6 @@ tag "linux" and which contain "torvalds". Note that -tags support is only available for tab completion, not for the actual command. The items which are completed on [m][m] are specified in the 'complete' option. -Without argument, reloads the current page. -Without argument but with [!], reloads the current page skipping the cache. ________________________________________________________________________________ diff --git a/xulmus/locale/en-US/browsing.txt b/xulmus/locale/en-US/browsing.txt index ea2c0856..fbdb1166 100644 --- a/xulmus/locale/en-US/browsing.txt +++ b/xulmus/locale/en-US/browsing.txt @@ -30,7 +30,7 @@ ________________________________________________________________________________ section:Opening{nbsp}web{nbsp}pages[opening] |o| |:o| |:open| -||:o[pen][!] [a][arg1][a], [a][arg2][a], ...|| + +||:o[pen] [a][arg1][a], [a][arg2][a], ...|| + ||o|| ________________________________________________________________________________ Open one or more URLs in the current tab. @@ -61,8 +61,6 @@ tag "linux" and which contain "torvalds". Note that -tags support is only available for tab completion, not for the actual command. The items which are completed on [m][m] are specified in the 'complete' option. -Without argument, reloads the current page. -Without argument but with [!], reloads the current page skipping the cache. ________________________________________________________________________________