From 8d9c2cddc0bb614d56e9093c5b91e849ea7b2625 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 22 Dec 2010 22:54:57 -0500
Subject: [PATCH] Fix some bugs.

---
 common/content/browser.js     | 2 +-
 common/content/commandline.js | 3 +++
 common/content/events.js      | 2 +-
 common/modules/util.jsm       | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/content/browser.js b/common/content/browser.js
index 7c3d44a4..7bc25097 100644
--- a/common/content/browser.js
+++ b/common/content/browser.js
@@ -127,7 +127,7 @@ const Browser = Module("browser", {
             "Go to the root of the website",
             function () { Browser.climbUrlPath(-1); });
 
-        mappings.add([modes.NORMAL], ["<C-l>"],
+        mappings.add(modes.all, ["<C-l>"],
             "Redraw the screen",
             function () { ex.redraw(); });
     },
diff --git a/common/content/commandline.js b/common/content/commandline.js
index 75fadbea..3386d9ee 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -659,6 +659,9 @@ const CommandLine = Module("commandline", {
      *          the MOW.
      */
     echo: function echo(str, highlightGroup, flags) {
+        if (String(str) == "undefined")
+            util.dumpStack();
+
         // dactyl.echo uses different order of flags as it omits the highlight group, change commandline.echo argument order? --mst
         if (this._silent)
             return;
diff --git a/common/content/events.js b/common/content/events.js
index b71d8685..b84f7463 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1122,7 +1122,7 @@ const Events = Module("events", {
                         return true;
 
                     let ret = execute(map, null, this.count);
-                    return map.route && ret;
+                    return !(map.route && ret);
                 }
             }
             else if (mappings.getCandidates(this.main, candidateCommand).length > 0 && !event.skipmap) {
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index cd7348db..bb023335 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -31,6 +31,7 @@ memoize(this, "Commands", function () {
 const FailedAssertion = Class("FailedAssertion", Error, {
     init: function (message) {
         update(this, Error(message))
+        this.message = message;
     }
 });