diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-10-21 19:05:48 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-10-21 19:05:48 +0300 |
| commit | 444c7ea83fe4c82035fbb1190606a3bdee064f26 (patch) | |
| tree | 9d2b4f9e083122e1697e4afb8bdb882752009a45 /src/menu.c | |
| parent | 9bc1999b6f2d92e06a2c3d95dfde0b64ee1c6daf (diff) | |
| download | emacs-444c7ea83fe4c82035fbb1190606a3bdee064f26.tar.gz emacs-444c7ea83fe4c82035fbb1190606a3bdee064f26.tar.bz2 emacs-444c7ea83fe4c82035fbb1190606a3bdee064f26.zip | |
; * src/menu.c (x_popup_menu_1): Make 'cancel_hourglass' call conditional.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/menu.c b/src/menu.c index 671fc65a38a..a8cb942a195 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 |