[Emacs-diffs] emacs/src menu.c ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/09/27 16:21:48

Modified files:
        src            : menu.c ChangeLog 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/menu.c?cvsroot=emacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7772&r2=1.7773

Patches:
Index: menu.c
===================================================================
RCS file: /sources/emacs/emacs/src/menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- menu.c      8 Jan 2009 03:15:50 -0000       1.13
+++ menu.c      27 Sep 2009 16:21:47 -0000      1.14
@@ -1005,7 +1005,7 @@
         {
           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 @@
     }
   return Qnil;
 }
-#endif
+#endif  /* HAVE_NS */
 
 void
 syms_of_menu ()

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7772
retrieving revision 1.7773
diff -u -b -r1.7772 -r1.7773
--- ChangeLog   27 Sep 2009 15:50:39 -0000      1.7772
+++ ChangeLog   27 Sep 2009 16:21:47 -0000      1.7773
@@ -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  <address@hidden>
 
        * keyboard.c (make_lispy_event): Remember last wheel direction.