From b1b4013662078e4134d32214aa2584610b65e29b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 4 Jun 2014 18:16:54 +0300 Subject: [PATCH] src/menu.c (Fx_popup_dialog): Comment the use of Qunsupported__w32_dialog. --- src/menu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/menu.c b/src/menu.c index b75e3dd6219..552ce1f2818 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1434,7 +1434,7 @@ no quit occurs and `x-popup-menu' returns nil. */) return selection; } -/* If F's terminal is not capable to display popup dialog, +/* If F's terminal is not capable of displaying a popup dialog, emulate it with a menu. */ static Lisp_Object @@ -1457,7 +1457,7 @@ emulate_dialog_with_menu (struct frame *f, Lisp_Object contents) x_coord -= SCHARS (prompt); y_coord = FRAME_LINES (f); } - + XSETFRAME (frame, f); XSETINT (x, x_coord / 2); XSETINT (y, y_coord / 2); @@ -1546,9 +1546,12 @@ for instance using the window manager, then this produces a quit and Lisp_Object selection = FRAME_TERMINAL (f)->popup_dialog_hook (f, header, contents); #ifdef HAVE_NTGUI + /* NTGUI supports only simple dialogs with Yes/No choices. For + other dialogs, it returns the symbol 'unsupported--w32-dialog', + as a signal for the caller to fall back to the emulation code. */ if (!EQ (selection, Qunsupported__w32_dialog)) -#endif - return selection; +#endif + return selection; } /* ... or emulate it with a menu. */ return emulate_dialog_with_menu (f, contents); -- 2.39.5