diff src/menubar-x.c @ 325:f2b5d7006b0a r21-0-60

Import from CVS: tag r21-0-60
author cvs
date Mon, 13 Aug 2007 10:47:35 +0200
parents 19dcec799385
children 182f72e8cd0d
line wrap: on
line diff
--- a/src/menubar-x.c	Mon Aug 13 10:47:10 2007 +0200
+++ b/src/menubar-x.c	Mon Aug 13 10:47:35 2007 +0200
@@ -124,6 +124,11 @@
 	{
 	  wv->name = string_chars;
 	  wv->enabled = 1;
+	  /* dverna Dec. 98: command_builder_operate_menu_accelerator will
+	     manipulate the accel as a Lisp_Object if the widget has a name.
+	     Since simple labels have a name, but no accel, we *must* set it
+	     to nil */
+	  wv->accel = LISP_TO_VOID (Qnil);
 	}
     }
   else if (VECTORP (desc))
@@ -255,7 +260,7 @@
 	      /* Add a fake entry so the menus show up */
 	      wv->contents = dummy = xmalloc_widget_value ();
 	      dummy->name = "(inactive)";
-	      dummy->accel = NULL;
+	      dummy->accel = LISP_TO_VOID (Qnil);
 	      dummy->enabled = 0;
 	      dummy->selected = 0;
 	      dummy->value = NULL;