From 7720b17a5a4c5ac14129091600e622f372456f17 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 26 Jan 2011 16:43:38 -0500
Subject: [PATCH] Fix placement of the status command-line.

---
 common/content/dactyl.js     |  2 --
 common/content/events.js     | 15 +++++++--------
 common/content/statusline.js |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 3183f37f..a24ae25b 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -503,8 +503,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 dactyl.focusedElement.blur();
             if (win && Editor.getEditor(win)) {
                 win.blur();
-                if (win.frameElement)
-                    util.dump("blur(" + util.objectToString(win.frameElement) + ")");
                 if (win.frameElement)
                     win.frameElement.blur();
             }
diff --git a/common/content/events.js b/common/content/events.js
index c70b9cb3..130b9aa1 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -451,15 +451,13 @@ var Events = Module("events", {
             this._lastMacro = macro.toLowerCase(); // XXX: sets last played macro, even if it does not yet exist
 
         if (this._macros.get(this._lastMacro)) {
-            // make sure the page is stopped before starting to play the macro
             try {
-                window.getWebNavigation().stop(nsIWebNavigation.STOP_ALL);
+                modes.replaying = true;
+                res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
+            }
+            finally {
+                modes.replaying = false;
             }
-            catch (e) {}
-
-            modes.replaying = true;
-            res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
-            modes.replaying = false;
         }
         else
             // TODO: ignore this like Vim?
@@ -537,7 +535,7 @@ var Events = Module("events", {
                 }
 
                 if (!this.feedingKeys)
-                    break;
+                    return false;
             }
         }
         catch (e) {
@@ -549,6 +547,7 @@ var Events = Module("events", {
             if (quiet)
                 commandline.quiet = wasQuiet;
         }
+        return true;
     },
 
     /**
diff --git a/common/content/statusline.js b/common/content/statusline.js
index da4e15b5..1fff5292 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -47,9 +47,9 @@ var StatusLine = Module("statusline", {
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
                 <hbox key="container" hidden="false" align="center"  flex="1">
                     <stack orient="horizontal"       align="stretch" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
-                        <hbox                                                 highlight="CmdLine StatusCmdLine" class="dactyl-container" id="dactyl-statusline-stack">
+                        <hbox                                                 highlight="CmdLine StatusCmdLine" class="dactyl-container">
                             <label key="mode"          crop="end"                                               class="plain" collapsed="true"/>
-                            <stack                                   flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
+                            <stack  id="dactyl-statusline-stack"     flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
                                 <textbox key="url"     crop="end"    flex="1"                                   class="plain dactyl-status-field-url" readonly="true"/>
                                 <textbox key="message" crop="end"    flex="1" highlight="Normal StatusNormal"   class="plain"                         readonly="true"/>
                             </stack>