# HG changeset patch
# User Jan D <jan.h.d@swipnet.se>
# Date 1281878294 -7200
# Node ID 96094f59e6e2bccfec3855ada7597704bd4b1821
# Parent  af075a74e6947346f9b053f299a552ef7a521e59
* keyboard.c (parse_tool_bar_item): Put in a bad label if :label
isn't a string.

diff -r af075a74e694 -r 96094f59e6e2 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 15 11:30:06 2010 +0200
+++ b/src/ChangeLog	Sun Aug 15 15:18:14 2010 +0200
@@ -1,3 +1,8 @@
+2010-08-15  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* keyboard.c (parse_tool_bar_item): Put in a bad label if :label
+	isn't a string.
+
 2010-08-15  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.
diff -r af075a74e694 -r 96094f59e6e2 src/keyboard.c
--- a/src/keyboard.c	Sun Aug 15 11:30:06 2010 +0200
+++ b/src/keyboard.c	Sun Aug 15 15:18:14 2010 +0200
@@ -8285,12 +8285,15 @@
 	    return 0;
 	}
       else if (EQ (key, QChelp))
-	/* `:help HELP-STRING'.  */
-	PROP (TOOL_BAR_ITEM_HELP) = value;
+        /* `:help HELP-STRING'.  */
+        PROP (TOOL_BAR_ITEM_HELP) = value;
       else if (EQ (key, QClabel))
         {
+          const char *bad_label = "!!?GARBLED ITEM?!!";
           /* `:label LABEL-STRING'.  */
-          PROP (TOOL_BAR_ITEM_LABEL) = value;
+          PROP (TOOL_BAR_ITEM_HELP) = STRINGP (value)
+            ? value
+            : make_string (bad_label, strlen (bad_label));
           have_label = 1;
         }
       else if (EQ (key, QCfilter))