Mercurial > emacs
diff src/xselect.c @ 69173:fdee8318ddc9
* xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary
argument.
* xterm.c: (x_load_font, x_term_init, XTmouse_position)
(handle_one_xevent, x_connection_closed, x_list_fonts): No arg for
x_uncatch_errors.
* xselect.c (x_own_selection, x_decline_selection_request)
(x_reply_selection_request, x_get_foreign_selection)
(Fx_get_atom_name, Fx_send_client_event): Likewise.
* xfns.c (x_real_positions, x_set_mouse_color, Fx_focus_frame):
Likewise.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 27 Feb 2006 03:35:31 +0000 |
parents | f2147c1027b6 |
children | b9ad41f39bf6 8976b9f5eda1 |
line wrap: on
line diff
--- a/src/xselect.c Mon Feb 27 02:07:37 2006 +0000 +++ b/src/xselect.c Mon Feb 27 03:35:31 2006 +0000 @@ -410,7 +410,7 @@ x_catch_errors (display); XSetSelectionOwner (display, selection_atom, selecting_window, time); x_check_errors (display, "Can't set selection: %s"); - x_uncatch_errors (display); + x_uncatch_errors (); UNBLOCK_INPUT; /* Now update the local cache */ @@ -586,7 +586,7 @@ x_catch_errors (reply.display); XSendEvent (reply.display, reply.requestor, False, 0L, (XEvent *) &reply); XFlush (reply.display); - x_uncatch_errors (reply.display); + x_uncatch_errors (); UNBLOCK_INPUT; } @@ -860,7 +860,7 @@ BLOCK_INPUT; unbind_to (count, Qnil); - x_uncatch_errors (display); + x_uncatch_errors (); UNBLOCK_INPUT; } @@ -1434,7 +1434,7 @@ BLOCK_INPUT; unbind_to (count, Qnil); x_check_errors (display, "Cannot get selection: %s"); - x_uncatch_errors (display); + x_uncatch_errors (); UNBLOCK_INPUT; if (NILP (XCAR (reading_selection_reply))) @@ -2673,7 +2673,7 @@ if (! x_had_errors_p (dpy)) ret = make_string (name, strlen (name)); - x_uncatch_errors (dpy); + x_uncatch_errors (); if (atom && name) XFree (name); if (NILP (ret)) ret = make_string ("", 0); @@ -2849,7 +2849,7 @@ XSendEvent (dpyinfo->display, wdest, propagate, mask, &event); XFlush (dpyinfo->display); } - x_uncatch_errors (dpyinfo->display); + x_uncatch_errors (); UNBLOCK_INPUT; return Qnil;