diff options
author | Richard M. Stallman <[email protected]> | 1994-03-14 00:18:52 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 1994-03-14 00:18:52 +0000 |
commit | 392d3f4b2734aca0f490ea5c072c6826b536bb8e (patch) | |
tree | c1f1ec65a0bec351b9a530b77f9e9439dac3f567 /src | |
parent | 7464b1311d2a4280aa1d6bb1d223824e54f4d3c1 (diff) |
Undo previous change. Instead:
(Fx_popup_dialog) [! USE_X_TOOLKIT]: Call Fx_popup_menu.
Diffstat (limited to 'src')
-rw-r--r-- | src/xmenu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 2effc7c38d..1d3bf19857 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -828,8 +828,6 @@ cached information about equivalent key sequences.") 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 @@ cached information about equivalent key sequences.") (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 @@ cached information about equivalent key sequences.") if (error_name) error (error_name); return selection; -} #endif +} #ifdef USE_X_TOOLKIT @@ -2100,7 +2101,5 @@ syms_of_xmenu () popup_id_tick = (1<<16); defsubr (&Sx_popup_menu); -#ifdef USE_X_TOOLKIT defsubr (&Sx_popup_dialog); -#endif } |