Mercurial > emacs
changeset 110392:0b48e1b8f0e3
* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 17 Sep 2010 11:54:28 +0200 |
| parents | bbc922c0cfa8 |
| children | 9718a33c16dc db80a924ac12 |
| files | src/ChangeLog src/keyboard.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Sep 17 11:04:35 2010 +0200 +++ b/src/ChangeLog Fri Sep 17 11:54:28 2010 +0200 @@ -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> * frame.c (Ftool_bar_pixel_width): New function to expose tool
--- a/src/keyboard.c Fri Sep 17 11:04:35 2010 +0200 +++ b/src/keyboard.c Fri Sep 17 11:54:28 2010 +0200 @@ -8305,7 +8305,7 @@ { const char *bad_label = "!!?GARBLED ITEM?!!"; /* `:label LABEL-STRING'. */ - PROP (TOOL_BAR_ITEM_HELP) = STRINGP (value) + PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value) ? value : make_string (bad_label, strlen (bad_label)); have_label = 1;