[Emacs-diffs] /srv/bzr/emacs/trunk r101457: * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.

[Jan D]

------------------------------------------------------------
revno: 101457
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-17 11:54:28 +0200
message:
  * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not 
HELP.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-17 09:04:35 +0000
+++ b/src/ChangeLog     2010-09-17 09:54:28 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Jan Djärv  <address@hidden>
+
+       * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
+       not HELP.
+
 2010-09-17  Stephen Berman  <address@hidden>
 
        * frame.c (Ftool_bar_pixel_width): New function to expose tool

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-08-31 19:42:39 +0000
+++ b/src/keyboard.c    2010-09-17 09:54:28 +0000
@@ -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;