summaryrefslogtreecommitdiff
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>2015-10-07 06:04:01 -0400
committerKen Raeburn <raeburn@raeburn.org>2015-10-11 01:15:08 -0400
commit5504ede9518053e619b2cc4bb01ce6eff254d3c8 (patch)
tree86e3fb272f4f27d8847291256c71bd5e30e06bfc /src/xmenu.c
parent54e3734a322aca9d396e4c7b0e73f08ac6c12501 (diff)
downloademacs-5504ede9518053e619b2cc4bb01ce6eff254d3c8.tar.gz
Introduce x_uncatch_errors_after_check to reduce XSync calls.
Both x_had_errors_p and x_check_errors call XSync, so if they're immediately followed by x_uncatch_errors, its XSync call will be redundant, resulting in a wasted round trip to the X server. * src/xterm.c (x_uncatch_errors_after_check): New routine; a copy of x_uncatch_errors without the XSync call. (XTmouse_position, x_wm_supports): * src/xfns.c (x_set_mouse_color): * src/xmenu.c (Fx_menu_bar_open_internal): * src/xselect.c (x_own_selection, x_get_foreign_selection): (Fx_get_atom_name): Call it instead of x_uncatch_errors. * src/xterm.h (x_uncatch_errors_after_check): Declare.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index f183c70b110..192ed89e2c6 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -325,7 +325,7 @@ If FRAME is nil or not given, use the selected frame. */)
/* Child of win. */
&child);
error_p = x_had_errors_p (FRAME_X_DISPLAY (f));
- x_uncatch_errors ();
+ x_uncatch_errors_after_check ();
if (! error_p)
{