From d7dfaf86f59bbf91fa27ffccb3310c849317cde1 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Sat, 28 Apr 2007 17:18:45 +0000 Subject: [PATCH] fixed :q command --- chrome/content/vimperator/commands.js | 7 +++++-- chrome/content/vimperator/help.js | 5 +++-- chrome/content/vimperator/settings.js | 4 ++-- chrome/content/vimperator/vimperator.js | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js index 881ff6df..cb0522e7 100644 --- a/chrome/content/vimperator/commands.js +++ b/chrome/content/vimperator/commands.js @@ -283,7 +283,7 @@ var g_commands = [/*{{{*/ [ ["quit", "q"], ["q[uit]"], - "Quit current tab or quit Vimperator if this was the last tab
" + + "Quit current tab or quit Vimperator if this was the last tab", "When quitting Vimperator, the session is not stored.", function (args) { tab_remove(1, false, 1); }, null @@ -1173,9 +1173,12 @@ function multiliner(line, prev_match, heredoc) function execute(string) { - if (!string) return; + if (!string) + return; + var tokens = tokenize_ex(string.replace(/^'(.*)'$/, '$1')); tokens[4] = arguments[3]; + return execute_command.apply(this, tokens); } //////////////////////////////////////////////////////////////////////// diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js index 8cea3067..84e16974 100644 --- a/chrome/content/vimperator/help.js +++ b/chrome/content/vimperator/help.js @@ -46,6 +46,7 @@ table.vimperator {\ border-color: gray gray gray gray;\ border-collapse: separate;\ background-color: white;\ + width: 800px !important;\ }\ table.vimperator th {\ border-width: 0px 0px 0px 0px;\ @@ -186,7 +187,7 @@ table.settings th {\ function makeSettingsHelpString(command) { var ret = ""; - ret = command[TYPE] + " (default: "; + ret = command[TYPE] + ' (default: '; if (command[TYPE] == "boolean") { if(command[DEFAULT] == true) @@ -202,7 +203,7 @@ table.settings th {\ ret += command[DEFAULT]; } - ret += ")
"; + ret += ")
"; return ret; } diff --git a/chrome/content/vimperator/settings.js b/chrome/content/vimperator/settings.js index de6638d6..f033acf8 100644 --- a/chrome/content/vimperator/settings.js +++ b/chrome/content/vimperator/settings.js @@ -96,7 +96,7 @@ var g_settings = [/*{{{*/ null, function(value) { set_pref("focusedhintstyle", value); }, function() { return get_pref("focusedhintstyle"); }, - "z-index:5000;font-family:monospace;font-size:12px;color:ButtonText;background-color:ButtonShadow;border-color:ButtonShadow;border-width:1px;border-style:solid;padding:0px 1px 0px 1px;position:absolute;", + "z-index:5000; font-family:monospace; font-size:12px; color:ButtonText; background-color:ButtonShadow; border-color:ButtonShadow; border-width:1px; border-style:solid; padding:0px 1px 0px 1px; position:absolute;", null ], [ @@ -144,7 +144,7 @@ var g_settings = [/*{{{*/ null, function(value) { set_pref("hintstyle", value); }, function() { return get_pref("hintstyle"); }, - "z-index:5000;font-family:monospace;font-size:12px;color:black;background-color:yellow;border-color:ButtonShadow;border-width:0px;border-style:solid;padding:0px 1px 0px 1px;position:absolute;", + "z-index:5000; font-family:monospace; font-size:12px; color:black; background-color:yellow; border-color:ButtonShadow; border-width:0px; border-style:solid; padding:0px 1px 0px 1px; position:absolute; ", null ], [ diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js index 66a42d5a..838bf90a 100644 --- a/chrome/content/vimperator/vimperator.js +++ b/chrome/content/vimperator/vimperator.js @@ -229,7 +229,7 @@ function init() BrowserStop(); help(); set_pref("firsttime", false); - },1000); + }, 1000); }