(command_loop_1): Don't call start_hourglass

or cancel_hourglass when executing a macro.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 2d46a1d99a9..cd3aa3793fb 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1651,7 +1651,8 @@ command_loop_1 ()
           /* 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 @@ command_loop_1 ()
 #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: ;