Fuck with :regressions a bit.

common/content/events.js

@@ -559,48 +559,7 @@ function Events() //{{{
     }
 
     // return true when load successful, or false otherwise
-    function waitForPageLoaded()
-    {
-        liberator.dump("start waiting in loaded state: " + buffer.loaded);
-        liberator.threadYield(true); // clear queue
-
-        if (buffer.loaded == 1)
-            return true;
-
-        let start = Date.now();
-        let end = start + 25000; // maximum time to wait - TODO: add option
-        let now;
-        while (now = Date.now(), now < end)
-        {
-            liberator.threadYield();
-            if ((now - start) % 1000 < 10)
-                liberator.dump("waited: " + (now - start) + " ms");
-
-            if (!events.feedingKeys)
-                return false;
-
-            if (buffer.loaded > 0)
-            {
-                liberator.sleep(250);
-                break;
-            }
-            else
-                liberator.echo("Waiting for page to load...");
-        }
-        modes.show();
-
-        // TODO: allow macros to be continued when page does not fully load with an option
-        var ret = (buffer.loaded == 1);
-        if (!ret)
-            liberator.echoerr("Page did not load completely in " + ms + " milliseconds. Macro stopped.");
-        liberator.dump("done waiting: " + ret);
-
-        // sometimes the input widget had focus when replaying a macro
-        // maybe this call should be moved somewhere else?
-        // liberator.focusContent(true);
-
-        return ret;
-    }
+    function waitForPageLoaded() events.waitForPageLoaded();
 
     // load all macros inside ~/.vimperator/macros/
     // setTimeout needed since io. is loaded after events.
@@ -1051,6 +1010,49 @@ function Events() //{{{
             return (key == "<Esc>" || key == "<C-[>" || key == "<C-c>");
         },
 
+        waitForPageLoad: function ()
+        {
+            liberator.dump("start waiting in loaded state: " + buffer.loaded);
+            liberator.threadYield(true); // clear queue
+
+            if (buffer.loaded == 1)
+                return true;
+
+            let start = Date.now();
+            let end = start + 25000; // maximum time to wait - TODO: add option
+            let now;
+            while (now = Date.now(), now < end)
+            {
+                liberator.threadYield();
+                if ((now - start) % 1000 < 10)
+                    liberator.dump("waited: " + (now - start) + " ms");
+
+                if (!events.feedingKeys)
+                    return false;
+
+                if (buffer.loaded > 0)
+                {
+                    liberator.sleep(250);
+                    break;
+                }
+                else
+                    liberator.echo("Waiting for page to load...");
+            }
+            modes.show();
+
+            // TODO: allow macros to be continued when page does not fully load with an option
+            var ret = (buffer.loaded == 1);
+            if (!ret)
+                liberator.echoerr("Page did not load completely in " + ms + " milliseconds. Macro stopped.");
+            liberator.dump("done waiting: " + ret);
+
+            // sometimes the input widget had focus when replaying a macro
+            // maybe this call should be moved somewhere else?
+            // liberator.focusContent(true);
+
+            return ret;
+        },
+
         // argument "event" is delibarately not used, as i don't seem to have
         // access to the real focus target
         //

common/content/liberator.js

@@ -635,12 +635,17 @@ const liberator = (function () //{{{
 
         registerObserver: registerObserver,
 
-        triggerObserver: function (type, data)
+        unregisterObserver: function (type, callback)
+        {
+            observers = observers.filter(function ([t, c]) t != type || c != callback);
+        },
+
+        triggerObserver: function (type)
         {
             for (let [,[thistype, callback]] in Iterator(observers))
             {
                 if (thistype == type)
-                    callback(data);
+                    callback.apply(null, Array.slice(arguments, 1));
             }
         },
 

common/content/ui.js

@@ -547,6 +547,8 @@ function CommandLine() //{{{
         setHighlightGroup(highlightGroup);
         messageBox.value = str;
 
+        liberator.triggerObserver("echoLine", str, highlightGroup, forceSingle);
+
         if (!commandShown())
             commandline.hide();
 
@@ -562,6 +564,8 @@ function CommandLine() //{{{
         let doc = multilineOutputWidget.contentDocument;
         let win = multilineOutputWidget.contentWindow;
 
+        liberator.triggerObserver("echoMultiline", str, highlightGroup);
+
         /* If it's already XML, assume it knows what it's doing.
          * Otherwise, white space is significant.
          * The problem elsewhere is that E4X tends to insert new lines