diff options
| author | Eli Zaretskii | 2013-09-29 21:50:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-29 21:50:28 +0300 |
| commit | 9f8551de937fbc95d4476d18ab1f1b986cfbf90e (patch) | |
| tree | 33d918d033bbe6a6c77f7d05ee508861f518146f /src | |
| parent | 0afa0aabd833fff2e8da06e24da6c4bab7aadec3 (diff) | |
| download | emacs-9f8551de937fbc95d4476d18ab1f1b986cfbf90e.tar.gz emacs-9f8551de937fbc95d4476d18ab1f1b986cfbf90e.zip | |
Fixed x-popup-dialog.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fns.c | 7 |
1 files changed, 3 insertions, 4 deletions
| @@ -2434,8 +2434,8 @@ a space; `yes-or-no-p' adds \"(yes or no) \" to it. | |||
| 2434 | The user must confirm the answer with RET, and can edit it until it | 2434 | The user must confirm the answer with RET, and can edit it until it |
| 2435 | has been confirmed. | 2435 | has been confirmed. |
| 2436 | 2436 | ||
| 2437 | Under a windowing system a dialog box will be used if `last-nonmenu-event' | 2437 | If dialog boxes are supported, a dialog box will be used |
| 2438 | is nil, and `use-dialog-box' is non-nil. */) | 2438 | if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) |
| 2439 | (Lisp_Object prompt) | 2439 | (Lisp_Object prompt) |
| 2440 | { | 2440 | { |
| 2441 | register Lisp_Object ans; | 2441 | register Lisp_Object ans; |
| @@ -2446,8 +2446,7 @@ is nil, and `use-dialog-box' is non-nil. */) | |||
| 2446 | 2446 | ||
| 2447 | #ifdef HAVE_MENUS | 2447 | #ifdef HAVE_MENUS |
| 2448 | if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) | 2448 | if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) |
| 2449 | && use_dialog_box | 2449 | && use_dialog_box) |
| 2450 | && window_system_available (SELECTED_FRAME ())) | ||
| 2451 | { | 2450 | { |
| 2452 | Lisp_Object pane, menu, obj; | 2451 | Lisp_Object pane, menu, obj; |
| 2453 | redisplay_preserve_echo_area (4); | 2452 | redisplay_preserve_echo_area (4); |