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

[Gerd Moellmann]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.661 emacs/src/keyboard.c:1.662
*** emacs/src/keyboard.c:1.661  Wed Mar  6 10:55:11 2002
--- emacs/src/keyboard.c        Fri Mar  8 06:34:00 2002
***************
*** 707,713 ****
       Lisp_Object str;
  {
    current_kboard->echo_string = str;
!   current_kboard->echo_after_prompt = XSTRING (str)->size;
    echo_now ();
  }
  
--- 707,713 ----
       Lisp_Object str;
  {
    current_kboard->echo_string = str;
!   current_kboard->echo_after_prompt = SCHARS (str);
    echo_now ();
  }
  
***************
*** 726,731 ****
--- 726,733 ----
        char *ptr = buffer;
        Lisp_Object echo_string;
  
+       echo_string = current_kboard->echo_string;
+       
        /* If someone has passed us a composite event, use its head symbol.  */
        c = EVENT_HEAD (c);
  
***************
*** 736,756 ****
        else if (SYMBOLP (c))
        {
          struct Lisp_String *name = XSYMBOL (c)->name;
          
!         if (size - (ptr - buffer) < STRING_BYTES (name))
            {
              int offset = ptr - buffer;
!             size = max (2 * size, size + STRING_BYTES (name));
              buffer = (char *) alloca (size);
              ptr = buffer + offset;
            }
  
!         ptr += copy_text (name->data, ptr, STRING_BYTES (name),
                            name->size_byte >= 0, 1);
        }
  
!       if ((NILP (current_kboard->echo_string)
!          || XSTRING (current_kboard->echo_string)->size == 0)
          && help_char_p (c))
        {
          const char *text = " (Type ? for further options)";
--- 738,758 ----
        else if (SYMBOLP (c))
        {
          struct Lisp_String *name = XSYMBOL (c)->name;
+         int nbytes = STRING_BYTES (name);
          
!         if (size - (ptr - buffer) < nbytes)
            {
              int offset = ptr - buffer;
!             size = max (2 * size, size + nbytes);
              buffer = (char *) alloca (size);
              ptr = buffer + offset;
            }
  
!         ptr += copy_text (name->data, ptr, nbytes,
                            name->size_byte >= 0, 1);
        }
  
!       if ((NILP (echo_string) || SCHARS (echo_string) == 0)
          && help_char_p (c))
        {
          const char *text = " (Type ? for further options)";
***************
*** 768,781 ****
          ptr += len;
        }
  
!       echo_string = current_kboard->echo_string;
!       
!       /* Replace a dash from echo_dash with a space.  */
        if (STRINGP (echo_string)
!         && (size = STRING_BYTES (XSTRING (echo_string)),
!             (size > 0
!              && XSTRING (echo_string)->data[size - 1] == '-')))
!       XSTRING (echo_string)->data[size - 1] = ' ';
  
        current_kboard->echo_string
        = concat2 (echo_string, make_string (buffer, ptr - buffer));
--- 770,790 ----
          ptr += len;
        }
  
!       /* 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 (" "));
!       }
  
        current_kboard->echo_string
        = concat2 (echo_string, make_string (buffer, ptr - buffer));
***************
*** 795,806 ****
      return;
  
    if (!current_kboard->immediate_echo
!       && XSTRING (current_kboard->echo_string)->size == 0)
      return;
        
    /* Do nothing if we just printed a prompt.  */
    if (current_kboard->echo_after_prompt
!       == XSTRING (current_kboard->echo_string)->size)
      return;
        
    /* Put a dash at the end of the buffer temporarily,
--- 804,815 ----
      return;
  
    if (!current_kboard->immediate_echo
!       && SCHARS (current_kboard->echo_string) == 0)
      return;
        
    /* Do nothing if we just printed a prompt.  */
    if (current_kboard->echo_after_prompt
!       == SCHARS (current_kboard->echo_string))
      return;
        
    /* Put a dash at the end of the buffer temporarily,
***************
*** 834,841 ****
  
    echoing = 1;
    message3_nolog (current_kboard->echo_string,
!                 STRING_BYTES (XSTRING (current_kboard->echo_string)),
!                 STRING_MULTIBYTE (current_kboard->echo_string));
    echoing = 0;
  
    /* Record in what buffer we echoed, and from which kboard.  */
--- 843,850 ----
  
    echoing = 1;
    message3_nolog (current_kboard->echo_string,
!                 SBYTES (current_kboard->echo_string),
!                 SMBP (current_kboard->echo_string));
    echoing = 0;
  
    /* Record in what buffer we echoed, and from which kboard.  */
***************
*** 865,871 ****
  echo_length ()
  {
    return (STRINGP (current_kboard->echo_string)
!         ? XSTRING (current_kboard->echo_string)->size
          : 0);
  }
  
--- 874,880 ----
  echo_length ()
  {
    return (STRINGP (current_kboard->echo_string)
!         ? SCHARS (current_kboard->echo_string)
          : 0);
  }