[Emacs-diffs] Changes to emacs/src/xselect.c

[Chong Yidong]

Index: emacs/src/xselect.c
diff -u emacs/src/xselect.c:1.158 emacs/src/xselect.c:1.159
--- emacs/src/xselect.c:1.158   Sat Feb 25 23:20:10 2006
+++ emacs/src/xselect.c Mon Feb 27 03:35:31 2006
@@ -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;