# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1110481711 0
# Node ID 5aa4c4b8de08b1c052d1d2ef5338d7babfaf9fd9
# Parent  2895b0a63b0edca4298ca93d5a7e924b903b70d2
* keyboard.c (Fexecute_extended_command): Restart hourglass
after call to Fcompleting_read if already started.

diff -r 2895b0a63b0e -r 5aa4c4b8de08 src/keyboard.c
--- a/src/keyboard.c	Thu Mar 10 19:08:01 2005 +0000
+++ b/src/keyboard.c	Thu Mar 10 19:08:31 2005 +0000
@@ -1350,6 +1350,11 @@
     cancel_hourglass ();
 #endif
 
+  /* Unblock input if we enter with input blocked.  This may happen if
+     redisplay traps e.g. during tool-bar update with input blocked.  */
+  while (INPUT_BLOCKED_P)
+    UNBLOCK_INPUT;
+
   return Fthrow (Qtop_level, Qnil);
 }
 
@@ -9711,6 +9716,15 @@
   Lisp_Object saved_keys, saved_last_point_position_buffer;
   Lisp_Object bindings, value;
   struct gcpro gcpro1, gcpro2, gcpro3;
+#ifdef HAVE_X_WINDOWS
+  /* The call to Fcompleting_read wil start and cancel the hourglass,
+     but if the hourglass was already scheduled, this means that no
+     hourglass will be shown for the actual M-x command itself.
+     So we restart it if it is already scheduled.  Note that checking
+     hourglass_shown_p is not enough,  normally the hourglass is not shown,
+     just scheduled to be shown.  */
+  int hstarted = hourglass_started ();
+#endif
 
   saved_keys = Fvector (this_command_key_count,
 			XVECTOR (this_command_keys)->contents);
@@ -9742,6 +9756,10 @@
 			       Qt, Qnil, Qextended_command_history, Qnil,
 			       Qnil);
 
+#ifdef HAVE_X_WINDOWS
+  if (hstarted) start_hourglass ();
+#endif
+
   if (STRINGP (function) && SCHARS (function) == 0)
     error ("No command name given");