procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.

Browse source
This commit is contained in:
Jan D 2010-09-17 11:54:28 +02:00
parent fb0cf781a1
commit e24ad6dd2b
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-09-17 Jan Djärv <jan.h.d@swipnet.se>
* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
not HELP.
2010-09-17 Stephen Berman <stephen.berman@gmx.net> 2010-09-17 Stephen Berman <stephen.berman@gmx.net>
* frame.c (Ftool_bar_pixel_width): New function to expose tool * frame.c (Ftool_bar_pixel_width): New function to expose tool

2
src/keyboard.c
View file

@ -8305,7 +8305,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
{ {
const char *bad_label = "!!?GARBLED ITEM?!!"; const char *bad_label = "!!?GARBLED ITEM?!!";
/* `:label LABEL-STRING'. */ /* `:label LABEL-STRING'. */
PROP (TOOL_BAR_ITEM_HELP) = STRINGP (value) PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value)
? value ? value
: make_string (bad_label, strlen (bad_label)); : make_string (bad_label, strlen (bad_label));
have_label = 1; have_label = 1;