aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWolfgang Jenkner2015-05-29 15:14:27 +0200
committerWolfgang Jenkner2015-05-29 16:29:18 +0200
commit7927a4a3b31d49b80bdc437c101e1155c450eb23 (patch)
tree6f5c1e345de68208f967919babd6fddf76b54062 /src
parent790ffd76e24e89f3a53b56ca9fde7a6444aec515 (diff)
downloademacs-7927a4a3b31d49b80bdc437c101e1155c450eb23.tar.gz
emacs-7927a4a3b31d49b80bdc437c101e1155c450eb23.zip
* src/xfns.c (x_set_menu_bar_lines): Fix calls to x_clear_area.
The signature was changed in the cairo branch, merged on 2015-05-23. This oversight broke compiling only the non-toolkit X version.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 5ac58e9c7e0..16a568e9153 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1084,8 +1084,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1084 y = FRAME_TOP_MARGIN_HEIGHT (f); 1084 y = FRAME_TOP_MARGIN_HEIGHT (f);
1085 1085
1086 block_input (); 1086 block_input ();
1087 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 1087 x_clear_area (f, 0, y, width, height);
1088 0, y, width, height);
1089 unblock_input (); 1088 unblock_input ();
1090 } 1089 }
1091 1090
@@ -1095,8 +1094,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1095 height = nlines * FRAME_LINE_HEIGHT (f) - y; 1094 height = nlines * FRAME_LINE_HEIGHT (f) - y;
1096 1095
1097 block_input (); 1096 block_input ();
1098 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 1097 x_clear_area (f, 0, y, width, height);
1099 0, y, width, height);
1100 unblock_input (); 1098 unblock_input ();
1101 } 1099 }
1102 1100