# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1137692395 0
# Node ID bd5ef7de54da07a5753a39b342ea532804bf77a6
# Parent  380cef0ff1392b5d906cc04ea4612e029ea36e41
(echo_char): Don't omit the space between first two echoed chars.

diff -r 380cef0ff139 -r bd5ef7de54da src/keyboard.c
--- a/src/keyboard.c	Thu Jan 19 17:38:57 2006 +0000
+++ b/src/keyboard.c	Thu Jan 19 17:39:55 2006 +0000
@@ -790,6 +790,8 @@
 	  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 @@
   /* 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;
-
-	  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);
-
-	  if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
-	    return;
+      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) - 1);
+      last_char = Faref (current_kboard->echo_string, idx);
+
+      if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
+	return;
     }
 
   /* Put a dash at the end of the buffer temporarily,