Don't explicitly pop Menu mode on menu_<Esc>. Closes issue #527. Normalize mode docs to Name rather than NAME.

common/content/buffer.js

@@ -1680,7 +1680,7 @@ var Buffer = Module("buffer", {
             { count: true });
 
         mappings.add([modes.NORMAL], ["i", "<Insert>"],
-            "Start CARET mode",
+            "Start Caret mode",
             function () { modes.push(modes.CARET); });
 
         mappings.add([modes.NORMAL], ["<C-c>", "<stop-load>"],

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",

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);
@@ -843,10 +843,10 @@ var Editor = Module("editor", {
         function bind() mappings.add.apply(mappings,
                                            [[modes.AUTOCOMPLETE]].concat(Array.slice(arguments)))
 
-        bind(["<Esc>"], "Return to INSERT mode",
+        bind(["<Esc>"], "Return to Insert mode",
              function () Events.PASS_THROUGH);
 
-        bind(["<C-[>"], "Return to INSERT mode",
+        bind(["<C-[>"], "Return to Insert mode",
              function () { events.feedkeys("<Esc>", { skipmap: true }); });
 
         bind(["<Up>"], "Select the previous autocomplete result",
@@ -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);
     }
 });

common/content/hints.js

@@ -1182,11 +1182,11 @@ var Hints = Module("hints", {
     mappings: function () {
         var myModes = config.browserModes.concat(modes.OUTPUT_MULTILINE);
         mappings.add(myModes, ["f"],
-            "Start HINTS mode",
+            "Start Hints mode",
             function () { hints.show("o"); });
 
         mappings.add(myModes, ["F"],
-            "Start HINTS 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, [";"],

common/content/modes.js

@@ -227,9 +227,10 @@ var Modes = Module("modes", {
                 XML.ignoreWhitespace = XML.prettyPrinting = false;
 
                 let res = <ul dactyl:highlight="Dense" xmlns:dactyl={NS}/>;
-                Object.keys(obj).sort().forEach(function (mode) {
+                Object.keys(obj).sort().forEach(function (name) {
-                    res.* += <li><em>{mode}</em>: {modes.getMode(mode).description}{
+                    let mode = modes.getMode(name);
-                        rec(obj[mode])
+                    res.* += <li><em>{mode.displayName}</em>: {mode.description}{
+                        rec(obj[name])
                     }</li>;
                 });
 
@@ -500,6 +501,8 @@ var Modes = Module("modes", {
 
         description: Messages.Localized(""),
 
+        displayName: Class.memoize(function () this.name.split("_").map(util.capitalize).join(" ")),
+
         isinstance: function isinstance(obj)
             this === obj || this.allBases.indexOf(obj) >= 0 || callable(obj) && this instanceof obj,
 
@@ -584,7 +587,7 @@ var Modes = Module("modes", {
     mappings: function initMappings() {
         mappings.add([modes.BASE, modes.NORMAL],
             ["<Esc>", "<C-[>"],
-            "Return to NORMAL mode",
+            "Return to Normal mode",
             function () { modes.reset(); });
 
         mappings.add([modes.INPUT, modes.COMMAND, modes.PASS_THROUGH, modes.QUOTE],
@@ -592,12 +595,13 @@ var Modes = Module("modes", {
             "Return to the previous mode",
             function () { modes.pop(); });
 
+        mappings.add([modes.MENU], ["<C-c>"],
+            "Leave Menu mode",
+            function () { modes.pop(); });
+
         mappings.add([modes.MENU], ["<Esc>"],
             "Close the current popup",
-            function () {
+            function () { return Events.PASS_THROUGH; });
-                modes.pop();
-                return Events.PASS_THROUGH;
-            });
 
         mappings.add([modes.MENU], ["<C-[>"],
             "Close the current popup",

common/modules/util.jsm

@@ -166,7 +166,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      * @param {string} str The string to capitalize
      * @returns {string}
      */
-    capitalize: function capitalize(str) str && str[0].toUpperCase() + str.slice(1),
+    capitalize: function capitalize(str) str && str[0].toUpperCase() + str.slice(1).toLowerCase(),
 
     /**
      * Returns a RegExp object that matches characters specified in the range