# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1051704487 0
# Node ID d4d06920c3ed2a1aa14ae19fb4314897cc2753a2
# Parent  7c1d1ca51ca73cbc77b865bfd808964267c648b2
(echo_char): Don't clear out a dash that follows a space.

diff -r 7c1d1ca51ca7 -r d4d06920c3ed src/keyboard.c
--- a/src/keyboard.c	Wed Apr 30 12:06:39 2003 +0000
+++ b/src/keyboard.c	Wed Apr 30 12:08:07 2003 +0000
@@ -785,14 +785,19 @@
       /* Replace a dash from echo_dash with a space, otherwise
 	 add a space at the end as a separator between keys.  */
       if (STRINGP (echo_string)
-	  && SCHARS (echo_string) > 0)
-	{
-	  Lisp_Object last_char, idx;
+	  && SCHARS (echo_string) > 1)
+	{
+	  Lisp_Object last_char, prev_char, idx;
+
+	  idx = make_number (SCHARS (echo_string) - 2);
+	  prev_char = Faref (echo_string, idx);
 
 	  idx = make_number (SCHARS (echo_string) - 1);
 	  last_char = Faref (echo_string, idx);
 
-	  if (XINT (last_char) == '-')
+	  /* We test PREV_CHAR to make sure this isn't the echoing
+	     of a minus-sign.  */
+	  if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
 	    Faset (echo_string, idx, make_number (' '));
 	  else
 	    echo_string = concat2 (echo_string, build_string (" "));