diff options
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/editfns.c b/src/editfns.c index 84a5c8395fc..e6e63c205b9 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3469,22 +3469,17 @@ usage: (message-box FORMAT-STRING &rest ARGS) */) { Lisp_Object val = Fformat (nargs, args); #ifdef HAVE_MENUS - /* The MS-DOS frames support popup menus even though they are - not FRAME_WINDOW_P. */ - if (FRAME_WINDOW_P (XFRAME (selected_frame)) - || FRAME_MSDOS_P (XFRAME (selected_frame))) - { - Lisp_Object pane, menu; - struct gcpro gcpro1; - pane = list1 (Fcons (build_string ("OK"), Qt)); - GCPRO1 (pane); - menu = Fcons (val, pane); - Fx_popup_dialog (Qt, menu, Qt); - UNGCPRO; - return val; - } -#endif /* HAVE_MENUS */ + Lisp_Object pane, menu; + struct gcpro gcpro1; + + pane = list1 (Fcons (build_string ("OK"), Qt)); + GCPRO1 (pane); + menu = Fcons (val, pane); + Fx_popup_dialog (Qt, menu, Qt); + UNGCPRO; +#else /* !HAVE_MENUS */ message3 (val); +#endif return val; } } |