From: Jan D <jan.h.d@swipnet.se>
Date: Fri, 17 Sep 2010 09:54:28 +0000 (+0200)
Subject: * keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e24ad6dd2b3499a367fff0dfd9c9c8a4bdaeb4fd;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 71a1caa38e8..df7202fc243 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/keyboard.c b/src/keyboard.c
index 7b1a39403f3..eed031a3c2e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8305,7 +8305,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
         {
           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;