aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-06-01 13:49:03 -0700
committerPaul Eggert2012-06-01 13:49:03 -0700
commit5fceba1d6a5c36c2155b7ce203b3574ef9eab1d6 (patch)
treeb8b5f9c0999e42d88ac64d23f9d3d557d640d920 /src
parent03fef3e61c9551d98f57d6fdd31d837912499101 (diff)
downloademacs-5fceba1d6a5c36c2155b7ce203b3574ef9eab1d6.tar.gz
emacs-5fceba1d6a5c36c2155b7ce203b3574ef9eab1d6.zip
* xfns.c (x_set_tool_bar_lines) [USE_GTK]: Adjust to bitfield change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 12845538a9e..72c76bf9fb0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-06-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xfns.c (x_set_tool_bar_lines) [USE_GTK]: Adjust to bitfield change.
4
12012-06-01 Dmitry Antipov <dmantipov@yandex.ru> 52012-06-01 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 For a 'struct window', replace some Lisp_Object fields to 7 For a 'struct window', replace some Lisp_Object fields to
diff --git a/src/xfns.c b/src/xfns.c
index b8ea9137a75..43ccdfaef1a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1291,7 +1291,7 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1291 FRAME_EXTERNAL_TOOL_BAR (f) = 1; 1291 FRAME_EXTERNAL_TOOL_BAR (f) = 1;
1292 if (FRAME_X_P (f) && f->output_data.x->toolbar_widget == 0) 1292 if (FRAME_X_P (f) && f->output_data.x->toolbar_widget == 0)
1293 /* Make sure next redisplay shows the tool bar. */ 1293 /* Make sure next redisplay shows the tool bar. */
1294 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt; 1294 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = 1;
1295 update_frame_tool_bar (f); 1295 update_frame_tool_bar (f);
1296 } 1296 }
1297 else 1297 else