aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-03-03 22:47:53 +0000
committerRichard M. Stallman1996-03-03 22:47:53 +0000
commit1e659e4c3a05511479bc5376cd56178a95513824 (patch)
tree37dc2ac25763ee4088d5b1c307599efdac16261e /src
parent647f2a686786fe24e7ec1f537599d9e879c9b0e5 (diff)
downloademacs-1e659e4c3a05511479bc5376cd56178a95513824.tar.gz
emacs-1e659e4c3a05511479bc5376cd56178a95513824.zip
Put most of file into HAVE_MENUS conditional.
(Fx_popup_menu): Put parts into HAVE_MENUS conditionals.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 7a63229e152..9e85afdfcda 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -771,6 +771,7 @@ cached information about equivalent key sequences.")
771 int for_click = 0; 771 int for_click = 0;
772 struct gcpro gcpro1; 772 struct gcpro gcpro1;
773 773
774#ifdef HAVE_MENUS
774 if (! NILP (position)) 775 if (! NILP (position))
775 { 776 {
776 check_x (); 777 check_x ();
@@ -844,6 +845,7 @@ cached information about equivalent key sequences.")
844 xpos += XINT (x); 845 xpos += XINT (x);
845 ypos += XINT (y); 846 ypos += XINT (y);
846 } 847 }
848#endif /* HAVE_MENUS */
847 849
848 title = Qnil; 850 title = Qnil;
849 GCPRO1 (title); 851 GCPRO1 (title);
@@ -923,6 +925,7 @@ cached information about equivalent key sequences.")
923 return Qnil; 925 return Qnil;
924 } 926 }
925 927
928#ifdef HAVE_MENUS
926 /* Display them in a menu. */ 929 /* Display them in a menu. */
927 BLOCK_INPUT; 930 BLOCK_INPUT;
928 931
@@ -933,11 +936,14 @@ cached information about equivalent key sequences.")
933 discard_menu_items (); 936 discard_menu_items ();
934 937
935 UNGCPRO; 938 UNGCPRO;
939#endif /* HAVE_MENUS */
936 940
937 if (error_name) error (error_name); 941 if (error_name) error (error_name);
938 return selection; 942 return selection;
939} 943}
940 944
945#ifdef HAVE_MENUS
946
941DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0, 947DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
942 "Pop up a dialog box and return user's selection.\n\ 948 "Pop up a dialog box and return user's selection.\n\
943POSITION specifies which frame to use.\n\ 949POSITION specifies which frame to use.\n\
@@ -2631,6 +2637,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
2631} 2637}
2632 2638
2633#endif /* not USE_X_TOOLKIT */ 2639#endif /* not USE_X_TOOLKIT */
2640
2641#endif /* HAVE_MENUS */
2634 2642
2635syms_of_xmenu () 2643syms_of_xmenu ()
2636{ 2644{
@@ -2646,5 +2654,7 @@ syms_of_xmenu ()
2646#endif 2654#endif
2647 2655
2648 defsubr (&Sx_popup_menu); 2656 defsubr (&Sx_popup_menu);
2657#ifdef HAVE_MENUS
2649 defsubr (&Sx_popup_dialog); 2658 defsubr (&Sx_popup_dialog);
2659#endif
2650} 2660}