From fbbb0ded296d0a214888965db3dfcc348acf960f Mon Sep 17 00:00:00 2001 From: John Foerch Date: Wed, 26 Aug 2009 12:19:14 -0400 Subject: [PATCH] renamed five commands go-up, go-home, go-back, go-forward, and help-with tutorial have been renamed to up, home, back, forward, and tutorial. this is to make them more logical and quicker to run with M-x. --- help/help.html | 4 ++-- modules/bindings/default/content-buffer/normal.js | 8 ++++---- modules/bindings/default/global.js | 2 +- modules/commands.js | 6 +++--- modules/content-buffer.js | 6 +++--- modules/page-modes/gmane.js | 2 +- modules/page-modes/google-calendar.js | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/help/help.html b/help/help.html index 15d9e11..50013f9 100644 --- a/help/help.html +++ b/help/help.html @@ -56,12 +56,12 @@ B - go-back + back   F - go-forward + forward   diff --git a/modules/bindings/default/content-buffer/normal.js b/modules/bindings/default/content-buffer/normal.js index c0d1455..aae2216 100644 --- a/modules/bindings/default/content-buffer/normal.js +++ b/modules/bindings/default/content-buffer/normal.js @@ -16,10 +16,10 @@ bind_scroll_keys(content_buffer_normal_keymap); bind_selection_keys(content_buffer_normal_keymap); // URL -define_key(content_buffer_normal_keymap, "u", "go-up"); -define_key(content_buffer_normal_keymap, "F", "go-forward"); -define_key(content_buffer_normal_keymap, "B", "go-back"); -define_key(content_buffer_normal_keymap, "l", "go-back"); +define_key(content_buffer_normal_keymap, "u", "up"); +define_key(content_buffer_normal_keymap, "F", "forward"); +define_key(content_buffer_normal_keymap, "B", "back"); +define_key(content_buffer_normal_keymap, "l", "back"); define_key(content_buffer_normal_keymap, "r", "reload"); define_key(content_buffer_normal_keymap, "g", "find-url"); define_key(content_buffer_normal_keymap, "G", "find-alternate-url"); diff --git a/modules/bindings/default/global.js b/modules/bindings/default/global.js index 64cd4ed..04aaf8b 100644 --- a/modules/bindings/default/global.js +++ b/modules/bindings/default/global.js @@ -36,7 +36,7 @@ define_key(default_help_keymap, "k", "describe-key"); define_key(default_help_keymap, "c", "describe-key-briefly"); define_key(default_help_keymap, "p", "describe-preference"); define_key(default_help_keymap, "i", "help-page"); -define_key(default_help_keymap, "t", "help-with-tutorial"); +define_key(default_help_keymap, "t", "tutorial"); define_key(default_help_keymap, "w", "where-is"); define_key(default_global_keymap, "M-x", "execute-extended-command"); diff --git a/modules/commands.js b/modules/commands.js index fcef29b..f2afd10 100644 --- a/modules/commands.js +++ b/modules/commands.js @@ -285,7 +285,7 @@ interactive("help-page", "Open the Conkeror help page.", "find-url-new-buffer", $browser_object = "chrome://conkeror-help/content/help.html"); -interactive("help-with-tutorial", "Open the Conkeror tutorial.", +interactive("tutorial", "Open the Conkeror tutorial.", "find-url-new-buffer", $browser_object = "chrome://conkeror-help/content/tutorial.html"); @@ -499,11 +499,11 @@ interactive("find-alternate-url", "Edit the current URL in the minibuffer", $prompt = "Find url"); -interactive("go-up", "Go to the parent directory of the current URL", +interactive("up", "Go to the parent directory of the current URL", "find-url", $browser_object = browser_object_up_url); -interactive("go-home", +interactive("home", "Go to the homepage in the current buffer.", "follow", $browser_object = function () { return homepage; }); diff --git a/modules/content-buffer.js b/modules/content-buffer.js index a5808b1..adc09d5 100644 --- a/modules/content-buffer.js +++ b/modules/content-buffer.js @@ -426,7 +426,7 @@ function go_back (b, prefix) { throw interactive_error("Can't go back"); } -interactive("go-back", +interactive("back", "Go back in the session history for the current buffer.", function (I) {go_back(I.buffer, I.p);}); @@ -446,8 +446,8 @@ function go_forward (b, prefix) { throw interactive_error("Can't go forward"); } -interactive("go-forward", - "Go back in the session history for the current buffer.", +interactive("forward", + "Go forward in the session history for the current buffer.", function (I) {go_forward(I.buffer, I.p);}); diff --git a/modules/page-modes/gmane.js b/modules/page-modes/gmane.js index 2af8c30..c6eeb45 100644 --- a/modules/page-modes/gmane.js +++ b/modules/page-modes/gmane.js @@ -16,7 +16,7 @@ define_key(gmane_keymap, "C-c c", "copy"); define_key(gmane_keymap, "C-c +", "zoom-in-text"); define_key(gmane_keymap, "C-c -", "zoom-out-text"); define_key(gmane_keymap, "C-c f", "follow"); -define_key(gmane_keymap, "C-c l", "go-back"); +define_key(gmane_keymap, "C-c l", "back"); define_key(gmane_keymap, "C-c n", "browser-object-links"); diff --git a/modules/page-modes/google-calendar.js b/modules/page-modes/google-calendar.js index 1491ee6..9219dee 100644 --- a/modules/page-modes/google-calendar.js +++ b/modules/page-modes/google-calendar.js @@ -31,7 +31,7 @@ define_key(google_calendar_keymap, "q", null, $fallthrough); define_key(google_calendar_keymap, "s", null, $fallthrough); define_key(google_calendar_keymap, "C-c s", "save"); define_key(google_calendar_keymap, "u", null, $fallthrough); -define_key(google_calendar_keymap, "C-c u", "go-up"); +define_key(google_calendar_keymap, "C-c u", "up"); define_key(google_calendar_keymap, "return", null, $fallthrough); define_key(google_calendar_keymap, "tab", null, $fallthrough); define_key(google_calendar_keymap, "M-s", null, $fallthrough); -- 2.11.4.GIT