aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-06-10 21:15:49 -0700
committerPaul Eggert2013-06-10 21:15:49 -0700
commit05e3e4125d3c2b19eba1cf86ac4a84011b83efb8 (patch)
treeac0a177a4cd8106987329142aff493832d9f6e6b /src
parentd583b36b05d14fe7330a75262d4950770c42adb0 (diff)
downloademacs-05e3e4125d3c2b19eba1cf86ac4a84011b83efb8.tar.gz
emacs-05e3e4125d3c2b19eba1cf86ac4a84011b83efb8.zip
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/keyboard.c11
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 @@
12013-06-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 * keyboard.c: Don't use PROP (...) as an lvalue.
4 (parse_tool_bar_item) [!USE_GTK && !HAVE_NS]:
5 Use set_prop (A, B), not PROP (A) = B.
6
12013-06-10 Eli Zaretskii <eliz@gnu.org> 72013-06-10 Eli Zaretskii <eliz@gnu.org>
2 8
3 * xdisp.c (get_it_property): Use it->window instead of generating 9 * 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)
8150#if !defined (USE_GTK) && !defined (HAVE_NS) 8150#if !defined (USE_GTK) && !defined (HAVE_NS)
8151 /* If we use build_desired_tool_bar_string to render the 8151 /* If we use build_desired_tool_bar_string to render the
8152 tool bar, the separator is rendered as an image. */ 8152 tool bar, the separator is rendered as an image. */
8153 PROP (TOOL_BAR_ITEM_IMAGES) 8153 set_prop (TOOL_BAR_ITEM_IMAGES,
8154 = menu_item_eval_property (Vtool_bar_separator_image_expression); 8154 (menu_item_eval_property
8155 PROP (TOOL_BAR_ITEM_ENABLED_P) = Qnil; 8155 (Vtool_bar_separator_image_expression)));
8156 PROP (TOOL_BAR_ITEM_SELECTED_P) = Qnil; 8156 set_prop (TOOL_BAR_ITEM_ENABLED_P, Qnil);
8157 PROP (TOOL_BAR_ITEM_CAPTION) = Qnil; 8157 set_prop (TOOL_BAR_ITEM_SELECTED_P, Qnil);
8158 set_prop (TOOL_BAR_ITEM_CAPTION, Qnil);
8158#endif 8159#endif
8159 return 1; 8160 return 1;
8160 } 8161 }