[Emacs-diffs] Changes to emacs/src/keyboard.c

[Richard M. Stallman]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.734 emacs/src/keyboard.c:1.735
*** emacs/src/keyboard.c:1.734  Fri Apr 11 19:44:10 2003
--- emacs/src/keyboard.c        Wed Apr 30 08:08:07 2003
***************
*** 785,798 ****
        /* 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;
  
          idx = make_number (SCHARS (echo_string) - 1);
          last_char = Faref (echo_string, idx);
  
!         if (XINT (last_char) == '-')
            Faset (echo_string, idx, make_number (' '));
          else
            echo_string = concat2 (echo_string, build_string (" "));
--- 785,803 ----
        /* 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) > 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);
  
!         /* 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 (" "));