diff options
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 2effc7c38d8..1d3bf19857c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -828,8 +828,6 @@ cached information about equivalent key sequences.") | |||
| 828 | return selection; | 828 | return selection; |
| 829 | } | 829 | } |
| 830 | 830 | ||
| 831 | #ifdef USE_X_TOOLKIT | ||
| 832 | |||
| 833 | DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 1, 2, 0, | 831 | DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 1, 2, 0, |
| 834 | "Pop up a dialog box and return user's selection.\n\ | 832 | "Pop up a dialog box and return user's selection.\n\ |
| 835 | POSITION is a position specification. This is either a mouse button event\n\ | 833 | POSITION is a position specification. This is either a mouse button event\n\ |
| @@ -862,6 +860,9 @@ cached information about equivalent key sequences.") | |||
| 862 | (position, menu) | 860 | (position, menu) |
| 863 | Lisp_Object position, menu; | 861 | Lisp_Object position, menu; |
| 864 | { | 862 | { |
| 863 | #ifndef USE_X_TOOLKIT | ||
| 864 | return Fx_popup_menu (position, menu); | ||
| 865 | #else | ||
| 865 | int number_of_panes, panes; | 866 | int number_of_panes, panes; |
| 866 | Lisp_Object keymap, tem; | 867 | Lisp_Object keymap, tem; |
| 867 | int xpos, ypos; | 868 | int xpos, ypos; |
| @@ -955,8 +956,8 @@ cached information about equivalent key sequences.") | |||
| 955 | 956 | ||
| 956 | if (error_name) error (error_name); | 957 | if (error_name) error (error_name); |
| 957 | return selection; | 958 | return selection; |
| 958 | } | ||
| 959 | #endif | 959 | #endif |
| 960 | } | ||
| 960 | 961 | ||
| 961 | #ifdef USE_X_TOOLKIT | 962 | #ifdef USE_X_TOOLKIT |
| 962 | 963 | ||
| @@ -2100,7 +2101,5 @@ syms_of_xmenu () | |||
| 2100 | 2101 | ||
| 2101 | popup_id_tick = (1<<16); | 2102 | popup_id_tick = (1<<16); |
| 2102 | defsubr (&Sx_popup_menu); | 2103 | defsubr (&Sx_popup_menu); |
| 2103 | #ifdef USE_X_TOOLKIT | ||
| 2104 | defsubr (&Sx_popup_dialog); | 2104 | defsubr (&Sx_popup_dialog); |
| 2105 | #endif | ||
| 2106 | } | 2105 | } |