From bf186edf8f1d1b6cac8a72d219b083ce9cd18454 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Thu, 21 Jul 2011 23:28:23 +1000 Subject: [PATCH] Normalise mode name references in command/option/mapping descriptions. --HG-- extra : rebase_source : e1de378b096c1292f237fcf45b1e6f926f7b6471 --- common/content/abbreviations.js | 4 ++-- common/content/buffer.js | 2 +- common/content/dactyl.js | 2 +- common/content/editor.js | 8 ++++---- common/content/hints.js | 8 ++++---- common/content/mappings.js | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js index fc7ddc6e..ab2bca02 100644 --- a/common/content/abbreviations.js +++ b/common/content/abbreviations.js @@ -375,8 +375,8 @@ var Abbreviations = Module("abbreviations", { } addAbbreviationCommands([modes.INSERT, modes.COMMAND_LINE], "", ""); - addAbbreviationCommands([modes.INSERT], "i", "insert"); - addAbbreviationCommands([modes.COMMAND_LINE], "c", "command line"); + addAbbreviationCommands([modes.INSERT], "i", "INSERT"); + addAbbreviationCommands([modes.COMMAND_LINE], "c", "COMMAND_LINE"); } }); diff --git a/common/content/buffer.js b/common/content/buffer.js index cd46f3dc..755f4fda 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -1680,7 +1680,7 @@ var Buffer = Module("buffer", { { count: true }); mappings.add([modes.NORMAL], ["i", ""], - "Start caret mode", + "Start CARET mode", function () { modes.push(modes.CARET); }); mappings.add([modes.NORMAL], ["", ""], diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 30f6c8c5..5e6e764a 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -1860,7 +1860,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { }); commands.add(["norm[al]"], - "Execute Normal mode commands", + "Execute NORMAL mode commands", function (args) { events.feedkeys(args[0], args.bang, false, modes.NORMAL); }, { argCount: "1", diff --git a/common/content/editor.js b/common/content/editor.js index b5d550cf..be2eb739 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -729,15 +729,15 @@ var Editor = Module("editor", { // visual mode mappings.add([modes.CARET, modes.TEXT_EDIT], - ["v"], "Start visual mode", + ["v"], "Start VISUAL mode", function () { modes.push(modes.VISUAL); }); mappings.add([modes.VISUAL], - ["v", "V"], "End visual mode", + ["v", "V"], "End VISUAL mode", function () { modes.pop(); }); mappings.add([modes.TEXT_EDIT], - ["V"], "Start visual line mode", + ["V"], "Start VISUAL LINE mode", function () { modes.push(modes.VISUAL, modes.LINE); editor.executeCommand("cmd_beginLine", 1); @@ -882,7 +882,7 @@ var Editor = Module("editor", { }); options.add(["insertmode", "im"], - "Enter Insert mode rather than Text Edit mode when focusing text areas", + "Enter INSERT mode rather than TEXT_EDIT mode when focusing text areas", "boolean", true); } }); diff --git a/common/content/hints.js b/common/content/hints.js index c59f9240..95ba9214 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -1182,20 +1182,20 @@ var Hints = Module("hints", { mappings: function () { var myModes = config.browserModes.concat(modes.OUTPUT_MULTILINE); mappings.add(myModes, ["f"], - "Start hint mode", + "Start HINTS mode", function () { hints.show("o"); }); mappings.add(myModes, ["F"], - "Start hint mode, but open link in a new tab", + "Start HINTS mode, but open link in a new tab", function () { hints.show(options.get("activate").has("links") ? "t" : "b"); }); mappings.add(myModes, [";"], - "Start an extended hint mode", + "Start an extended hints mode", function ({ count }) { hints.open(";", { count: count }); }, { count: true }); mappings.add(myModes, ["g;"], - "Start an extended hint mode and stay there until is pressed", + "Start an extended hints mode and stay there until is pressed", function ({ count }) { hints.open("g;", { continue: true, count: count }); }, { count: true }); diff --git a/common/content/mappings.js b/common/content/mappings.js index 30495c4a..5f5dcb6b 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -689,7 +689,7 @@ var Mappings = Module("mappings", { if (mode.char && !commands.get(mode.char + "map", true)) addMapCommands(mode.char, [m.mask for (m in modes.mainModes) if (m.char == mode.char)], - [mode.name.toLowerCase()]); + [mode.name]); let args = { getMode: function (args) findMode(args["-mode"]),