Commit 0005830c authored by Jan D's avatar Jan D
Browse files

* keyboard.c (parse_tool_bar_item): Put in a bad label if :label

isn't a string.
parent 603dfc72
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.
......
......@@ -8285,12 +8285,15 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment