diff options
| author | Eli Zaretskii | 2014-06-04 18:16:54 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-06-04 18:16:54 +0300 |
| commit | b1b4013662078e4134d32214aa2584610b65e29b (patch) | |
| tree | e8847e0352da1395fba3c63e94dd9eb6709a4dde /src | |
| parent | 680a6ad9327fc056854cac0a3e7679a32cb63a93 (diff) | |
| download | emacs-b1b4013662078e4134d32214aa2584610b65e29b.tar.gz emacs-b1b4013662078e4134d32214aa2584610b65e29b.zip | |
src/menu.c (Fx_popup_dialog): Comment the use of Qunsupported__w32_dialog.
Diffstat (limited to 'src')
| -rw-r--r-- | src/menu.c | 11 |
1 files 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. */) | |||
| 1434 | return selection; | 1434 | return selection; |
| 1435 | } | 1435 | } |
| 1436 | 1436 | ||
| 1437 | /* If F's terminal is not capable to display popup dialog, | 1437 | /* If F's terminal is not capable of displaying a popup dialog, |
| 1438 | emulate it with a menu. */ | 1438 | emulate it with a menu. */ |
| 1439 | 1439 | ||
| 1440 | static Lisp_Object | 1440 | static Lisp_Object |
| @@ -1457,7 +1457,7 @@ emulate_dialog_with_menu (struct frame *f, Lisp_Object contents) | |||
| 1457 | x_coord -= SCHARS (prompt); | 1457 | x_coord -= SCHARS (prompt); |
| 1458 | y_coord = FRAME_LINES (f); | 1458 | y_coord = FRAME_LINES (f); |
| 1459 | } | 1459 | } |
| 1460 | 1460 | ||
| 1461 | XSETFRAME (frame, f); | 1461 | XSETFRAME (frame, f); |
| 1462 | XSETINT (x, x_coord / 2); | 1462 | XSETINT (x, x_coord / 2); |
| 1463 | XSETINT (y, y_coord / 2); | 1463 | XSETINT (y, y_coord / 2); |
| @@ -1546,9 +1546,12 @@ for instance using the window manager, then this produces a quit and | |||
| 1546 | Lisp_Object selection | 1546 | Lisp_Object selection |
| 1547 | = FRAME_TERMINAL (f)->popup_dialog_hook (f, header, contents); | 1547 | = FRAME_TERMINAL (f)->popup_dialog_hook (f, header, contents); |
| 1548 | #ifdef HAVE_NTGUI | 1548 | #ifdef HAVE_NTGUI |
| 1549 | /* NTGUI supports only simple dialogs with Yes/No choices. For | ||
| 1550 | other dialogs, it returns the symbol 'unsupported--w32-dialog', | ||
| 1551 | as a signal for the caller to fall back to the emulation code. */ | ||
| 1549 | if (!EQ (selection, Qunsupported__w32_dialog)) | 1552 | if (!EQ (selection, Qunsupported__w32_dialog)) |
| 1550 | #endif | 1553 | #endif |
| 1551 | return selection; | 1554 | return selection; |
| 1552 | } | 1555 | } |
| 1553 | /* ... or emulate it with a menu. */ | 1556 | /* ... or emulate it with a menu. */ |
| 1554 | return emulate_dialog_with_menu (f, contents); | 1557 | return emulate_dialog_with_menu (f, contents); |