* keyboard.c: Don't use PROP (...) as an lvalue.

(parse_tool_bar_item) [!USE_GTK && !HAVE_NS]:
Use set_prop (A, B), not PROP (A) = B.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c4e39e5d9239ad908712ebdc9cc2aafc57e6422..34876d4759be370cfad66f930b28f9d779522701 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * keyboard.c: Don't use PROP (...) as an lvalue.
+       (parse_tool_bar_item) [!USE_GTK && !HAVE_NS]:
+       Use set_prop (A, B), not PROP (A) = B.
+
 2013-06-10  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (get_it_property): Use it->window instead of generating

diff --git a/src/keyboard.c b/src/keyboard.c
index d01ecb9432bbe7af8314734649824641ef475121..7cb4c4b91e32144d2dc1f2cde79070291de9a7be 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8150,11 +8150,12 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
 #if !defined (USE_GTK) && !defined (HAVE_NS)
          /* If we use build_desired_tool_bar_string to render the
             tool bar, the separator is rendered as an image.  */
-         PROP (TOOL_BAR_ITEM_IMAGES)
-           = menu_item_eval_property (Vtool_bar_separator_image_expression);
-         PROP (TOOL_BAR_ITEM_ENABLED_P) = Qnil;
-         PROP (TOOL_BAR_ITEM_SELECTED_P) = Qnil;
-         PROP (TOOL_BAR_ITEM_CAPTION) = Qnil;
+         set_prop (TOOL_BAR_ITEM_IMAGES,
+                   (menu_item_eval_property
+                    (Vtool_bar_separator_image_expression)));
+         set_prop (TOOL_BAR_ITEM_ENABLED_P, Qnil);
+         set_prop (TOOL_BAR_ITEM_SELECTED_P, Qnil);
+         set_prop (TOOL_BAR_ITEM_CAPTION, Qnil);
 #endif
          return 1;
        }