From 5a519b2f9c52fc7e8303b338582624fc5f71ebec Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 19 Feb 2011 07:52:01 -0500
Subject: [PATCH] Fix closing menus on <Esc> broken in revision bf712a2498ed.

---
 common/content/editor.js | 6 +++---
 common/content/modes.js  | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/content/editor.js b/common/content/editor.js
index 9bf016ee..8a692da9 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -844,19 +844,19 @@ var Editor = Module("editor", {
                                            [[modes.AUTOCOMPLETE]].concat(Array.slice(arguments)))
 
         bind(["<Esc>"], "Return to INSERT mode",
-             function () Events.PASS);
+             function () Events.PASS_THROUGH);
 
         bind(["<C-[>"], "Return to INSERT mode",
              function () { events.feedkeys("<Esc>", { skipmap: true }); });
 
         bind(["<Up>"], "Select the previous autocomplete result",
-             function () Events.PASS);
+             function () Events.PASS_THROUGH);
 
         bind(["<C-p>"], "Select the previous autocomplete result",
              function () { events.feedkeys("<Up>", { skipmap: true }); });
 
         bind(["<Down>"], "Select the next autocomplete result",
-             function () Events.PASS);
+             function () Events.PASS_THROUGH);
 
         bind(["<C-n>"], "Select the next autocomplete result",
              function () { events.feedkeys("<Down>", { skipmap: true }); });
diff --git a/common/content/modes.js b/common/content/modes.js
index 6c302a18..0c7aa62b 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -522,7 +522,10 @@ var Modes = Module("modes", {
 
         mappings.add([modes.MENU], ["<Esc>"],
             "Close the current popup",
-            function () Events.PASS);
+            function () {
+                modes.pop();
+                return Events.PASS_THROUGH;
+            });
 
         mappings.add([modes.MENU], ["<C-[>"],
             "Close the current popup",