# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1093896861 0
# Node ID 6079dd23b546325651b7aaa79e14cbc8ea3ee5f2
# Parent  5817080daeba11b2058fd1dbc0ac15be332dd030
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.

diff -r 5817080daeba -r 6079dd23b546 src/ChangeLog
--- a/src/ChangeLog	Mon Aug 30 19:42:53 2004 +0000
+++ b/src/ChangeLog	Mon Aug 30 20:14:21 2004 +0000
@@ -4,8 +4,7 @@
 	instead of name and key.
 	(update_submenu_strings): New function.
 	(set_frame_menubar): Remove call to inhibit_garbage_collection,
-	call update_submenu_strings.  Call ENCODE_MENU_STRING for top level
-	menu names.
+	call update_submenu_strings.
 
 	* gtkutil.h (_widget_value): Added lname and lkey.
 
diff -r 5817080daeba -r 6079dd23b546 src/xmenu.c
--- a/src/xmenu.c	Mon Aug 30 19:42:53 2004 +0000
+++ b/src/xmenu.c	Mon Aug 30 20:14:21 2004 +0000
@@ -2056,7 +2056,7 @@
 	  string = XVECTOR (items)->contents[i + 1];
 	  if (NILP (string))
             break;
-          wv->name = (char *) SDATA (ENCODE_MENU_STRING (string));
+          wv->name = (char *) SDATA (string);
           update_submenu_strings (wv->contents);
           wv = wv->next;
 	}
@@ -2088,7 +2088,7 @@
 	    break;
 
 	  wv = xmalloc_widget_value ();
-	  wv->name = (char *) SDATA (ENCODE_MENU_STRING (string));
+	  wv->name = (char *) SDATA (string);
 	  wv->value = 0;
 	  wv->enabled = 1;
 	  wv->button_type = BUTTON_TYPE_NONE;