From: Pavel Janík <Pavel@Janik.cz>
Date: Wed, 6 Feb 2002 22:41:43 +0000 (+0000)
Subject: (recursive_edit_1): Call cancel_hourglass unconditionally.
X-Git-Tag: ttn-vms-21-2-B4~16808
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8e2d5ba90eaa1823b7797694924e73348ab31ad;p=emacs.git

(recursive_edit_1): Call cancel_hourglass unconditionally.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 109503afa52..c26d6a1296f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -928,8 +928,8 @@ recursive_edit_1 ()
 #ifdef HAVE_X_WINDOWS
   /* The command loop has started an hourglass timer, so we have to
      cancel it here, otherwise it will fire because the recursive edit
-     can take some time.  */
-  if (display_hourglass_p)
+     can take some time.  Do not check for display_hourglass_p here,
+     because it could already be nil.  */
     cancel_hourglass ();
 #endif