changeset 44561:b79166cba466

(command_loop_1): Don't call start_hourglass or cancel_hourglass when executing a macro.
author Richard M. Stallman <rms@gnu.org>
date Sat, 13 Apr 2002 17:48:10 +0000
parents 0fddc27db9ae
children 11442d8a69cc
files src/keyboard.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Sat Apr 13 17:47:20 2002 +0000
+++ b/src/keyboard.c	Sat Apr 13 17:48:10 2002 +0000
@@ -1651,7 +1651,8 @@
 	  /* Here for a command that isn't executed directly */
 
 #ifdef HAVE_X_WINDOWS
-	  if (display_hourglass_p)
+	  if (display_hourglass_p
+	      && NILP (Vexecuting_macro))
 	    start_hourglass ();
 #endif
 
@@ -1663,8 +1664,11 @@
 #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 ();
+	     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: ;