Mercurial > emacs
changeset 6325:d6817c9c0413
Undo previous change. Instead:
(Fx_popup_dialog) [! USE_X_TOOLKIT]: Call Fx_popup_menu.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 14 Mar 1994 00:18:52 +0000 |
| parents | fa8040a2bba9 |
| children | 5e662ad3f594 |
| files | src/xmenu.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Mon Mar 14 00:08:07 1994 +0000 +++ b/src/xmenu.c Mon Mar 14 00:18:52 1994 +0000 @@ -828,8 +828,6 @@ return selection; } -#ifdef USE_X_TOOLKIT - DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 1, 2, 0, "Pop up a dialog box and return user's selection.\n\ POSITION is a position specification. This is either a mouse button event\n\ @@ -862,6 +860,9 @@ (position, menu) Lisp_Object position, menu; { +#ifndef USE_X_TOOLKIT + return Fx_popup_menu (position, menu); +#else int number_of_panes, panes; Lisp_Object keymap, tem; int xpos, ypos; @@ -955,8 +956,8 @@ if (error_name) error (error_name); return selection; +#endif } -#endif #ifdef USE_X_TOOLKIT @@ -2100,7 +2101,5 @@ popup_id_tick = (1<<16); defsubr (&Sx_popup_menu); -#ifdef USE_X_TOOLKIT defsubr (&Sx_popup_dialog); -#endif }