From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Sun, 27 Sep 2009 16:21:47 +0000 (+0000)
Subject: * menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove double-casting in client_... 
X-Git-Tag: emacs-pretest-23.1.90~1115
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31c2d412664650a0aab8fe6bb5350a5d54ca460a;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index b284d1476c3..be55c6bc793 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -13,6 +13,9 @@
 	(ns_set_name_as_filename, x-create-frame, ns-get-resource)
 	(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>
 
 	* keyboard.c (make_lispy_event): Remember last wheel direction.
diff --git a/src/menu.c b/src/menu.c
index 940986fd536..5331cbc3144 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1005,7 +1005,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
         {
           entry
             = 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)
                 {
@@ -1025,7 +1025,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
     }
   return Qnil;
 }
-#endif
+#endif  /* HAVE_NS */
 
 void
 syms_of_menu ()