[Emacs-diffs] /srv/bzr/emacs/trunk r101091: * keyboard.c (parse_tool_bar_item): Put in a bad label if :label

[Jan D]

------------------------------------------------------------
revno: 101091
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-15 15:18:14 +0200
message:
  * keyboard.c (parse_tool_bar_item): Put in a bad label if :label
  isn't a string.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-15 09:30:06 +0000
+++ b/src/ChangeLog     2010-08-15 13:18:14 +0000
@@ -1,3 +1,8 @@
+2010-08-15  Jan Djärv  <address@hidden>
+
+       * keyboard.c (parse_tool_bar_item): Put in a bad label if :label
+       isn't a string.
+
 2010-08-15  Andreas Schwab  <address@hidden>
 
        * keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-08-15 09:30:06 +0000
+++ b/src/keyboard.c    2010-08-15 13:18:14 +0000
@@ -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))