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

[Richard M. Stallman]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.225 emacs/src/xmenu.c:1.226
*** emacs/src/xmenu.c:1.225     Tue Nov 13 02:10:29 2001
--- emacs/src/xmenu.c   Sun Dec  2 00:07:16 2001
***************
*** 246,253 ****
    menu_items_submenu_depth = 0;
  }
  
! /* Call at the end of generating the data in menu_items.
!    This fills in the number of items in the last pane.  */
  
  static void
  finish_menu_items ()
--- 246,252 ----
    menu_items_submenu_depth = 0;
  }
  
! /* Call at the end of generating the data in menu_items.  */
  
  static void
  finish_menu_items ()
***************
*** 1186,1192 ****
    struct frame *f;
    Lisp_Object frame, help;
  
!   help = wv && wv->help ? build_string (wv->help) : Qnil;
    
    /* Determine the frame for the help event.  */
    f = menubar_id_to_frame (id);
--- 1185,1191 ----
    struct frame *f;
    Lisp_Object frame, help;
  
!   help = wv ? wv->help : Qnil;
    
    /* Determine the frame for the help event.  */
    f = menubar_id_to_frame (id);
***************
*** 1535,1545 ****
            abort ();
  
          wv->selected = !NILP (selected);
!         if (STRINGP (help))
!           wv->help = (char *) XSTRING (help)->data;
!           else
!             wv->help = NULL;
  
          prev_wv = wv;
  
          i += MENU_ITEMS_ITEM_LENGTH;
--- 1534,1544 ----
            abort ();
  
          wv->selected = !NILP (selected);
!         if (! STRINGP (help))
!           help = Qnil;
  
+         wv->help = help;
+ 
          prev_wv = wv;
  
          i += MENU_ITEMS_ITEM_LENGTH;
***************
*** 2132,2142 ****
            abort ();
  
          wv->selected = !NILP (selected);
  
!           if (STRINGP (help))
!             wv->help = (char *) XSTRING (help)->data;
!           else
!             wv->help = NULL;
  
          prev_wv = wv;
  
--- 2131,2141 ----
            abort ();
  
          wv->selected = !NILP (selected);
+ 
+           if (! STRINGP (help))
+           help = Qnil;
  
!         wv->help = help;
  
          prev_wv = wv;