From 05e3e4125d3c2b19eba1cf86ac4a84011b83efb8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 10 Jun 2013 21:15:49 -0700 Subject: [PATCH] * 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. --- src/ChangeLog | 6 ++++++ src/keyboard.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7c4e39e5d92..34876d4759b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-06-11 Paul Eggert + + * 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 * xdisp.c (get_it_property): Use it->window instead of generating diff --git a/src/keyboard.c b/src/keyboard.c index d01ecb9432b..7cb4c4b91e3 100644 --- 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; } -- 2.39.2