X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmenubar-x.c;h=62122813bbcc5c475b026fe2502ff1301012c1ec;hb=6797bde39c52203650064ef8e079af5a9c5f124a;hp=61258db1521474630377a3f3a53f543f1fe7ea4a;hpb=976b002b16336930724ae22476014583ad022e7d;p=chise%2Fxemacs-chise.git-

diff --git a/src/menubar-x.c b/src/menubar-x.c
index 61258db..6212281 100644
--- a/src/menubar-x.c
+++ b/src/menubar-x.c
@@ -131,7 +131,8 @@ menu_item_descriptor_to_widget_value_1 (Lisp_Object desc,
     }
   else if (VECTORP (desc))
     {
-      if (!button_item_to_widget_value (desc, wv, 1,
+      Lisp_Object gui_item = gui_parse_item_keywords (desc);
+      if (!button_item_to_widget_value (gui_item, wv, 1,
 					(menu_type == MENUBAR_TYPE
 					 && depth <= 1)))
 	{
@@ -157,7 +158,7 @@ menu_item_descriptor_to_widget_value_1 (Lisp_Object desc,
 	  wv->enabled = 1;
 	  wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc)));
 
-	  accel = menu_name_to_accelerator (wv->name);
+	  accel = gui_name_accelerator (LISP_GETTEXT (XCAR (desc)));
 	  wv->accel = LISP_TO_VOID (accel);
 
 	  desc = Fcdr (desc);