Possibly stem aforementioned focus bug.

--HG--
branch : bootstrapped

3 files changed, 4 insertions, 5 deletions

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6799408c..a8e58e23 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -623,8 +623,10 @@ var CommandLine = Module("commandline", {
             this.widgets.message = null;
         if (modes.main != modes.COMMAND_LINE)
             this.widgets.command = null;
-        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd)
+        if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd) {
+            dactyl.focusContent();
             modes.pop();
+        }
         if (modes.main != modes.OUTPUT_MULTILINE)
             this.multilineOutputVisible = false;
     },
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 01fcd24a..06756fad 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -419,9 +419,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      *     element.
      */
     focusContent: function focusContent(clearFocusedElement) {
-        util.dump("focusContent(" + clearFocusedElement + ") " +
-                  (window == services.focus.activeWindow));
-
         if (window != services.focus.activeWindow)
             return;
 
diff --git a/common/content/modes.js b/common/content/modes.js
index f51fd648..7cfcf97d 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -81,7 +81,7 @@ var Modes = Module("modes", {
             postExecute: function (map) { if (modes.main == modes.QUOTE && map.name === "<C-v>") modes.pop() },
             onEvent: function () { if (modes.main == modes.QUOTE) modes.pop() }
         });
-        this.addMode("OUTPUT_MULTILINE", { ownsFocus: true });
+        this.addMode("OUTPUT_MULTILINE");
 
         // this._extended modes, can include multiple modes, and even main modes
         this.addMode("EX", true);