aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorStefan Monnier2008-07-17 03:33:59 +0000
committerStefan Monnier2008-07-17 03:33:59 +0000
commitfacfbbbdad272decb23553d827fbc2c0fabaf078 (patch)
tree14d37d409d30bdec0cbfc0ed79593021e1e88ab2 /src/menu.c
parentd377ef4a3f6c77c451b647305436d1e8bf914b07 (diff)
downloademacs-facfbbbdad272decb23553d827fbc2c0fabaf078.tar.gz
emacs-facfbbbdad272decb23553d827fbc2c0fabaf078.zip
* Makefile.in: Undef LIB_STANDARD before defining it to silence warning
in case it was defined already. USE @GNUSTEP_MAKEFILES@ rather than envvars. * nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to ns_default. (applicationShouldTerminate, setValuesFromPanel): Use EQ to compare Lisp_Objects. * nsterm.h (Fx_display_grayscale_p, Fx_display_planes) (ns_defined_color, ns_color_to_lisp): Declare. * nsselect.m (ns_handle_selection_request, ns_handle_selection_clear) (Fns_own_selection_internal): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects. (update_frame_tool_bar): Remove apparently obsolete tests for non-integerness of f->tool_bar_lines. (windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast. (nsfont_open): Don't confuse NULL for Qnil. * nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects. * menu.h (find_and_call_menu_selection): * menu.c (find_and_call_menu_selection): Use just int for vector size. (find_and_return_menu_selection): Always return something. * frame.h: Include dispextern.h for Display_Info. (display_x_get_resource): Declare. * configure.in: Extract and substitute GNUSTEP_MAKEFILES.
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c
index 969225d4c72..e3882dbd965 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -881,7 +881,7 @@ update_submenu_strings (first_wv)
881void 881void
882find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data) 882find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data)
883 FRAME_PTR f; 883 FRAME_PTR f;
884 EMACS_INT menu_bar_items_used; 884 int menu_bar_items_used;
885 Lisp_Object vector; 885 Lisp_Object vector;
886 void *client_data; 886 void *client_data;
887{ 887{
@@ -1023,6 +1023,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
1023 i += MENU_ITEMS_ITEM_LENGTH; 1023 i += MENU_ITEMS_ITEM_LENGTH;
1024 } 1024 }
1025 } 1025 }
1026 return Qnil;
1026} 1027}
1027#endif 1028#endif
1028 1029