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

[Richard M. Stallman]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.672 emacs/src/keyboard.c:1.673
*** emacs/src/keyboard.c:1.672  Fri Apr 12 05:35:34 2002
--- emacs/src/keyboard.c        Sat Apr 13 13:48:10 2002
***************
*** 1651,1657 ****
          /* Here for a command that isn't executed directly */
  
  #ifdef HAVE_X_WINDOWS
!         if (display_hourglass_p)
            start_hourglass ();
  #endif
  
--- 1651,1658 ----
          /* Here for a command that isn't executed directly */
  
  #ifdef HAVE_X_WINDOWS
!         if (display_hourglass_p
!             && NILP (Vexecuting_macro))
            start_hourglass ();
  #endif
  
***************
*** 1663,1670 ****
  #ifdef HAVE_X_WINDOWS
          /* Do not check display_hourglass_p here, because
             Fcommand_execute could change it, but we should cancel
!            hourglass cursor anyway.  */
!         cancel_hourglass ();
  #endif
        }
      directly_done: ;
--- 1664,1674 ----
  #ifdef HAVE_X_WINDOWS
          /* Do not check display_hourglass_p here, because
             Fcommand_execute could change it, but we should cancel
!            hourglass cursor anyway.
!            But don't cancel the hourglass within a macro
!            just because a command in the macro finishes.  */
!         if (NILP (Vexecuting_macro))
!           cancel_hourglass ();
  #endif
        }
      directly_done: ;