From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 Jan 2006 17:39:55 +0000 (+0000)
Subject: (echo_char): Don't omit the space between first two echoed chars.
X-Git-Tag: emacs-pretest-22.0.90~4691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3be81c7f8cf445b27dbbe2e26eaeaa4687591f1;p=emacs.git

(echo_char): Don't omit the space between first two echoed chars.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index aaeeeade541..897f691a5e9 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,