[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 444c7ea83f: ; * src/menu.c (x_popup_menu_1): Make 'cancel_hourgla
From: |
Eli Zaretskii |
Subject: |
master 444c7ea83f: ; * src/menu.c (x_popup_menu_1): Make 'cancel_hourglass' call conditional. |
Date: |
Fri, 21 Oct 2022 12:06:30 -0400 (EDT) |
branch: master
commit 444c7ea83fe4c82035fbb1190606a3bdee064f26
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; * src/menu.c (x_popup_menu_1): Make 'cancel_hourglass' call conditional.
---
src/menu.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/menu.c b/src/menu.c
index 671fc65a38..a8cb942a19 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1392,6 +1392,7 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
run_hook (Qx_pre_popup_menu_hook);
+#ifdef HAVE_WINDOW_SYSTEM
/* Cancel the hourglass timer. Depending on how the show_menu_hook
is implemented, the hourglass window can either be mapped (or on
non-X systems, the hourglass cursor can be defined) either while
@@ -1400,6 +1401,7 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
detect input immediately after a popup menu generated by Custom
is unmapped. */
cancel_hourglass ();
+#endif
/* Display them in a menu, but not if F is the initial frame that
doesn't have its hooks set (e.g., in a batch session), because
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 444c7ea83f: ; * src/menu.c (x_popup_menu_1): Make 'cancel_hourglass' call conditional.,
Eli Zaretskii <=