Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS

1 files changed, 9 insertions, 7 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 07a0deaf828..8434dbe1d7a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -790,6 +790,8 @@ echo_char (c)
           else
             echo_string = concat2 (echo_string, build_string (" "));
         }
+      else if (STRINGP (echo_string))
+        echo_string = concat2 (echo_string, build_string (" "));
 
       current_kboard->echo_string
         = concat2 (echo_string, make_string (buffer, ptr - buffer));
@@ -820,16 +822,16 @@ echo_dash ()
   /* Do nothing if we have already put a dash at the end.  */
   if (SCHARS (current_kboard->echo_string) > 1)
     {
-          Lisp_Object last_char, prev_char, idx;
+      Lisp_Object last_char, prev_char, idx;
 
-          idx = make_number (SCHARS (current_kboard->echo_string) - 2);
-          prev_char = Faref (current_kboard->echo_string, idx);
+      idx = make_number (SCHARS (current_kboard->echo_string) - 2);
+      prev_char = Faref (current_kboard->echo_string, idx);
 
-          idx = make_number (SCHARS (current_kboard->echo_string) - 1);
-          last_char = Faref (current_kboard->echo_string, idx);
+      idx = make_number (SCHARS (current_kboard->echo_string) - 1);
+      last_char = Faref (current_kboard->echo_string, idx);
 
-          if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
-            return;
+      if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+        return;
     }
 
   /* Put a dash at the end of the buffer temporarily,