aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPavel Janík2002-02-06 22:41:43 +0000
committerPavel Janík2002-02-06 22:41:43 +0000
commitd8e2d5ba90eaa1823b7797694924e73348ab31ad (patch)
treeda9ca7f49c8c185733fb2aac60cbb5b9869e9379 /src
parent1c71b9580a92ce5a7a749231f42f2849d9f44ffe (diff)
downloademacs-d8e2d5ba90eaa1823b7797694924e73348ab31ad.tar.gz
emacs-d8e2d5ba90eaa1823b7797694924e73348ab31ad.zip
(recursive_edit_1): Call cancel_hourglass unconditionally.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c4
1 files changed, 2 insertions, 2 deletions
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 ()
928#ifdef HAVE_X_WINDOWS 928#ifdef HAVE_X_WINDOWS
929 /* The command loop has started an hourglass timer, so we have to 929 /* The command loop has started an hourglass timer, so we have to
930 cancel it here, otherwise it will fire because the recursive edit 930 cancel it here, otherwise it will fire because the recursive edit
931 can take some time. */ 931 can take some time. Do not check for display_hourglass_p here,
932 if (display_hourglass_p) 932 because it could already be nil. */
933 cancel_hourglass (); 933 cancel_hourglass ();
934#endif 934#endif
935 935