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

[Kim F. Storm]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.705 emacs/src/keyboard.c:1.706
*** emacs/src/keyboard.c:1.705  Mon Aug 19 10:58:29 2002
--- emacs/src/keyboard.c        Mon Sep  9 18:33:36 2002
***************
*** 9786,9795 ****
  
  DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
         doc: /* Discard the contents of the terminal input buffer.
! Also cancel any kbd macro being defined.  */)
       ()
  {
!   current_kboard->defining_kbd_macro = Qnil;
    update_mode_lines++;
  
    Vunread_command_events = Qnil;
--- 9786,9801 ----
  
  DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
         doc: /* Discard the contents of the terminal input buffer.
! Also end any kbd macro being defined.  */)
       ()
  {
!   if (!NILP (current_kboard->defining_kbd_macro))
!     {
!       /* Discard the last command from the macro.  */
!       Fcancel_kbd_macro_events ();
!       end_kbd_macro ();
!     }
! 
    update_mode_lines++;
  
    Vunread_command_events = Qnil;