[Emacs-diffs] Changes to emacs/src/w32menu.c [lexbind]

[Miles Bader]

Index: emacs/src/w32menu.c
diff -c emacs/src/w32menu.c:1.55.4.3 emacs/src/w32menu.c:1.55.4.4
*** emacs/src/w32menu.c:1.55.4.3        Sun Dec 28 05:20:02 2003
--- emacs/src/w32menu.c Tue Jul  6 09:24:08 2004
***************
*** 2225,2233 ****
          /* Set help string for menu item.  Leave it as a Lisp_Object
             until it is ready to be displayed, since GC can happen while
             menus are active.  */
!         if (wv->help)
!           info.dwItemData = (DWORD) wv->help;
! 
          if (wv->button_type == BUTTON_TYPE_RADIO)
            {
              /* CheckMenuRadioItem allows us to differentiate TOGGLE and
--- 2225,2236 ----
          /* Set help string for menu item.  Leave it as a Lisp_Object
             until it is ready to be displayed, since GC can happen while
             menus are active.  */
!         if (!NILP (wv->help))
! #ifdef USE_LISP_UNION_TYPE
!           info.dwItemData = (DWORD) (wv->help).i;
! #else
!           info.dwItemData = (DWORD) (wv->help);
! #endif
          if (wv->button_type == BUTTON_TYPE_RADIO)
            {
              /* CheckMenuRadioItem allows us to differentiate TOGGLE and
***************
*** 2307,2313 ****
--- 2310,2321 ----
          info.fMask = MIIM_DATA;
          get_menu_item_info (menu, item, FALSE, &info);
  
+ #ifdef USE_LISP_UNION_TYPE
+         help = info.dwItemData ? (Lisp_Object) ((EMACS_INT) info.dwItemData)
+                                : Qnil;
+ #else
          help = info.dwItemData ? (Lisp_Object) info.dwItemData : Qnil;
+ #endif
        }
  
        /* Store the help echo in the keyboard buffer as the X toolkit