diff --git a/src/ChangeLog b/src/ChangeLog
index 8b482e66fd5..d9a5a749d63 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-02  Pavel Jan,Bm(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 39a4cf93f28..109503afa52 100644
--- 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: ;