From 29de1f0e8acc8b51c478e13dbc5d3c1cd03a0367 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 8 Dec 2008 12:33:23 -0500
Subject: [PATCH] Use FORCE_SINGLELINE in a few more places

---
 common/content/buffer.js | 4 ++--
 common/content/events.js | 6 +++---
 common/content/find.js   | 8 ++++----
 common/content/io.js     | 3 +--
 common/content/ui.js     | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 09078adb..6b84205a 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -476,7 +476,7 @@ function Buffer() //{{{
             var aps = options.getPref("print.always_print_silent");
             var spp = options.getPref("print.show_print_progress");
 
-            liberator.echo("Sending to printer...");
+            liberator.echomsg("Sending to printer...");
             options.setPref("print.always_print_silent", args.bang);
             options.setPref("print.show_print_progress", !args.bang);
 
@@ -484,7 +484,7 @@ function Buffer() //{{{
 
             options.setPref("print.always_print_silent", aps);
             options.setPref("print.show_print_progress", spp);
-            liberator.echo("Print job sent.");
+            liberator.echomsg("Print job sent.");
         },
         {
             argCount: "0",
diff --git a/common/content/events.js b/common/content/events.js
index c422eaba..7f8936a6 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1036,7 +1036,7 @@ function Events() //{{{
                     break;
                 }
                 else
-                    liberator.echo("Waiting for page to load...");
+                    liberator.echomsg("Waiting for page to load...");
             }
             modes.show();
 
@@ -1236,7 +1236,7 @@ function Events() //{{{
                 {
                     modes.isRecording = false;
                     liberator.log("Recorded " + currentMacro + ": " + macros.get(currentMacro), 9);
-                    liberator.echo("Recorded macro '" + currentMacro + "'");
+                    liberator.echomsg("Recorded macro '" + currentMacro + "'");
                     event.preventDefault();
                     event.stopPropagation();
                     return true;
@@ -1259,7 +1259,7 @@ function Events() //{{{
                 if (key == "<C-c>" && !event.isMacro)
                 {
                     events.feedingKeys = false;
-                    setTimeout(function () { liberator.echo("Canceled playback of macro '" + lastMacro + "'") }, 100);
+                    setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'") }, 100);
                     event.preventDefault();
                     event.stopPropagation();
                     return true;
diff --git a/common/content/find.js b/common/content/find.js
index 80306d6e..f757133a 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -345,7 +345,7 @@ function Search() //{{{
             found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
             if (!found)
-                setTimeout(function () { liberator.echoerr("E486: Pattern not found: " + searchPattern); }, 0);
+                setTimeout(function () liberator.echoerr("E486: Pattern not found: " + searchPattern, commandline.FORCE_SINGLELINE), 0);
 
             return found;
         },
@@ -364,7 +364,7 @@ function Search() //{{{
 
             if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
             {
-                liberator.echoerr("E486: Pattern not found: " + lastSearchPattern);
+                liberator.echoerr("E486: Pattern not found: " + lastSearchPattern, commandline.FORCE_SINGLELINE);
             }
             else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
             {
@@ -373,10 +373,10 @@ function Search() //{{{
                 setTimeout(function () {
                     if (up)
                         commandline.echo("search hit TOP, continuing at BOTTOM",
-                            commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES);
+                            commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
                     else
                         commandline.echo("search hit BOTTOM, continuing at TOP",
-                            commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES);
+                            commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
                 }, 0);
             }
             else
diff --git a/common/content/io.js b/common/content/io.js
index b6d644e7..46adb893 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -889,8 +889,7 @@ lookup:
                                 // should be appended to and the MOW opened
                                 liberator.echoerr("Error detected while processing " + file.path,
                                     commandline.FORCE_MULTILINE);
-                                commandline.echo("line " + lineNumber + ":", commandline.HL_LINENR,
-                                    commandline.APPEND_TO_MESSAGES);
+                                commandline.echomsg("line " + lineNumber + ":", commandline.HL_LINENR);
                                 liberator.echoerr("E492: Not an editor command: " + line);
                             }
                             else
diff --git a/common/content/ui.js b/common/content/ui.js
index 136ba90a..e9073117 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1712,7 +1712,7 @@ function StatusLine() //{{{
                 if (value == 0)
                     document.getElementById("status-bar").collapsed = true;
                 else if (value == 1)
-                    liberator.echo("show status line only with > 1 window not implemented yet");
+                    liberator.echoerr("show status line only with > 1 window not implemented yet");
                 else
                     document.getElementById("status-bar").collapsed = false;