(command_loop_1) [HAVE_X_WINDOWS]: Call cancel_hourglass unconditionally.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b482e66fd58cfd5ff45263bda09bf46600c845e..d9a5a749d6350333a0905ef10398810212f873a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-02  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * keyboard.c (command_loop_1) [HAVE_X_WINDOWS]: Call
+       cancel_hourglass unconditionally.
+
+       * eval.c (Fsignal): Remove duplicated declaration of
+       the variable `display_hourglass_p'.
+
 2002-01-31  Richard M. Stallman  <rms@gnu.org>
 
        * editfns.c (region_limit): Nicer error message.

diff --git a/src/keyboard.c b/src/keyboard.c
index 39a4cf93f2802521c119fae947c5d3a3f37f1dd2..109503afa52437480d4985618d87a5b488dcb5fc 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1641,8 +1641,10 @@ command_loop_1 ()
          Fcommand_execute (Vthis_command, Qnil, Qnil, Qnil);
 
 #ifdef HAVE_X_WINDOWS
-         if (display_hourglass_p)
-           cancel_hourglass ();
+         /* 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: ;