1 files changed, 5 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 26c1e8ffddb..9fea4df7538 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1121,6 +1121,11 @@ cmd_error (data)
   Lisp_Object old_level, old_length;
   char macroerror[50];
 
+#ifdef HAVE_X_WINDOWS
+  if (display_hourglass_p)
+    cancel_hourglass ();
+#endif
+
   if (!NILP (executing_macro))
     {
       if (executing_macro_iterations == 1)