Commit 31c2d412 authored by Adrian Robert's avatar Adrian Robert
Browse files

* menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove double-casting in...

* menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove double-casting in client_data comparison.
parent 135abf91
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
(ns_set_name_as_filename, x-create-frame, ns-get-resource) (ns_set_name_as_filename, x-create-frame, ns-get-resource)
(ns-set-resource): Use ns_app_name instead of NSProcessInfo call. (ns-set-resource): Use ns_app_name instead of NSProcessInfo call.
   
* menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove
double-casting in client_data comparison.
2009-09-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 2009-09-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
   
* keyboard.c (make_lispy_event): Remember last wheel direction. * keyboard.c (make_lispy_event): Remember last wheel direction.
......
...@@ -1005,7 +1005,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data) ...@@ -1005,7 +1005,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
{ {
entry entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
if ((int) (EMACS_INT)client_data == (int)(&XVECTOR (menu_items)->contents[i])) if ((EMACS_INT)client_data == (EMACS_INT)(&XVECTOR (menu_items)->contents[i]))
{ {
if (keymaps != 0) if (keymaps != 0)
{ {
...@@ -1025,7 +1025,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data) ...@@ -1025,7 +1025,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
} }
return Qnil; return Qnil;
} }
#endif #endif /* HAVE_NS */
void void
syms_of_menu () syms_of_menu ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment