From 45f6153de486a6052d715bc6bd25cc31216e8f0e Mon Sep 17 00:00:00 2001
From: Ted Pavlic <ted@tedpavlic.com>
Date: Sat, 17 Jan 2009 12:55:56 -0500
Subject: [PATCH] More command-line edits (now elsewhere in the source).

---
 common/content/events.js    |  2 +-
 common/content/liberator.js |  4 ++--
 common/content/ui.js        | 12 ++++++------
 common/content/util.js      |  2 +-
 vimperator/TODO             |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 5478322a..d50c76c5 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -887,7 +887,7 @@ function Events() //{{{
          *     to be taken literally, prepend it with a "\\".
          * @param {boolean} noremap Allow recursive mappings.
          * @param {boolean} silent Whether the command should be echoed to the
-         *     command-line.
+         *     command line.
          * @returns {boolean}
          */
         feedkeys: function (keys, noremap, silent)
diff --git a/common/content/liberator.js b/common/content/liberator.js
index ce11a326..87fcbd96 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -656,7 +656,7 @@ const liberator = (function () //{{{
 
         beep: function ()
         {
-            // FIXME: popups clear the command-line
+            // FIXME: popups clear the command line
             if (options["visualbell"])
             {
                 // flash the visual bell
@@ -745,7 +745,7 @@ const liberator = (function () //{{{
             // But it's _supposed_ to show the MOW on startup when there are
             // messages, surely?  As far as I'm concerned it essentially works
             // exactly as it should with the DISALLOW_MULTILINE flag removed.
-            // Sending N messages to the command-line in a row and having them
+            // Sending N messages to the command line in a row and having them
             // overwrite each other is completely broken. I also think many of
             // those messages like "Added quick mark" are plain silly but if
             // you don't like them you can set verbose=0, or use :silent when
diff --git a/common/content/ui.js b/common/content/ui.js
index f526b02a..6254b67d 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -605,7 +605,7 @@ function CommandLine() //{{{
     }
 
     /**
-     * Determines whether the command-line should be visible.
+     * Determines whether the command line should be visible.
      *
      * @return {boolean}
      */
@@ -1026,7 +1026,7 @@ function CommandLine() //{{{
         get message() messageBox.value,
 
         /**
-         * Open the command-line. The main mode is set to
+         * Open the command line. The main mode is set to
          * COMMAND_LINE, the extended mode to <b>extendedMode</b>.
          * Further, callbacks defined for <b>extendedMode</b> are
          * triggered as appropriate (see {@link Liberator#registerCallback}).
@@ -1061,8 +1061,8 @@ function CommandLine() //{{{
         },
 
         /**
-         * Closes the command-line. This is ordinarily triggered automatically
-         * by a mode change. Will not hide the command-line immediately if
+         * Closes the command line. This is ordinarily triggered automatically
+         * by a mode change. Will not hide the command line immediately if
          * called directly after a successful command, otherwise it will.
          */
         close: function close()
@@ -1099,7 +1099,7 @@ function CommandLine() //{{{
         },
 
         /**
-         * Hides the command-line, and shows any status messages that
+         * Hides the command line, and shows any status messages that
          * are under it.
          */
         hide: function hide()
@@ -1108,7 +1108,7 @@ function CommandLine() //{{{
         },
 
         /**
-         * Output the given string onto the command-line. With no flags, the
+         * Output the given string onto the command line. With no flags, the
          * message will be shown in the status line if it's short enough to
          * fit, and contains no new lines, and isn't XML. Otherwise, it will be
          * shown in the MOW.
diff --git a/common/content/util.js b/common/content/util.js
index 286937c3..95a73230 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -177,7 +177,7 @@ const util = { //{{{
 
     /**
      * Copies a string to the system clipboard. If <b>verbose</b> is specified
-     * the copied string is also echoed to the command-line.
+     * the copied string is also echoed to the command line.
      *
      * @param {string} str
      * @param {boolean} verbose
diff --git a/vimperator/TODO b/vimperator/TODO
index 77810e86..7ee8644c 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -26,7 +26,7 @@ BUGS:
   else it chucks, I haven't investigated --djk
 - messages is still broken in several ways - needs testing.
   => :ls | :echomsg "Foobar" doesn't add "Foobar" to the already open MOW.
-  => it often overwrites the open command-line while editing etc.
+  => it often overwrites the open command line while editing etc.
 - <tags> and <keyword> autocmd 'keywords' are not available when adding a
   bookmark - they're being set after the observer triggers the autocmd event.
 - MOW is broken for multiple commands when open E.g. :ls | ls