mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
Code Issues Projects Releases Wiki Activity

Undo previous change. Instead:

Browse source 
(Fx_popup_dialog) [! USE_X_TOOLKIT]: Call Fx_popup_menu.
This commit is contained in:
Richard M. Stallman 1994-03-14 00:18:52 +00:00
parent 7464b1311d
commit 392d3f4b27
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xmenu.c
View file

@ -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
}