# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1007269636 0
# Node ID 26c1876db9e3fcafda749c18556685f4268dd0ec
# Parent  b0e866164182d0b387fc1ae2df7d00fcd3c1aba9
(menu_highlight_callback): Use `help' field as Lisp_Object.
(single_submenu, xmenu_show): Set `help' field as Lisp_Object.

diff -r b0e866164182 -r 26c1876db9e3 src/xmenu.c
--- a/src/xmenu.c	Sun Dec 02 05:04:19 2001 +0000
+++ b/src/xmenu.c	Sun Dec 02 05:07:16 2001 +0000
@@ -246,8 +246,7 @@
   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.  */
+/* Call at the end of generating the data in menu_items.  */
 
 static void
 finish_menu_items ()
@@ -1186,7 +1185,7 @@
   struct frame *f;
   Lisp_Object frame, help;
 
-  help = wv && wv->help ? build_string (wv->help) : Qnil;
+  help = wv ? wv->help : Qnil;
   
   /* Determine the frame for the help event.  */
   f = menubar_id_to_frame (id);
@@ -1535,10 +1534,10 @@
 	    abort ();
 
 	  wv->selected = !NILP (selected);
-	  if (STRINGP (help))
-	    wv->help = (char *) XSTRING (help)->data;
-          else
-            wv->help = NULL;
+	  if (! STRINGP (help))
+	    help = Qnil;
+
+	  wv->help = help;
 
 	  prev_wv = wv;
 
@@ -2133,10 +2132,10 @@
 
 	  wv->selected = !NILP (selected);
 
-          if (STRINGP (help))
-            wv->help = (char *) XSTRING (help)->data;
-          else
-            wv->help = NULL;
+          if (! STRINGP (help))
+	    help = Qnil;
+
+	  wv->help = help;
 
 	  prev_wv = wv;