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.
+2006-02-26 Chong Yidong <cyd@stupidchicken.com>
+
+ * 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.
+
2006-02-26 Luc Teirlinck <teirllm@auburn.edu>
* lread.c: Declare Vload_file_rep_suffixes instead of
2006-02-25 Chong Yidong <cyd@stupidchicken.com>
* xterm.h (x_catch_errors) Return value changed to void.
- (x_uncatch_errors): Delete unused count argument delete.
+ (x_uncatch_errors): Delete unused count argument.
* xterm.c (x_catch_errors): Don't use record_unwind_protect, since
it can be called in a signal handler.
had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
}
- x_uncatch_errors (FRAME_X_DISPLAY (f));
+ x_uncatch_errors ();
UNBLOCK_INPUT;
/* Check and report errors with the above calls. */
x_check_errors (dpy, "can't set cursor shape: %s");
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
{
XColor fore_color, back_color;
x_catch_errors (dpy);
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
RevertToParent, CurrentTime);
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
return Qnil;
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 */
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;
}
BLOCK_INPUT;
unbind_to (count, Qnil);
- x_uncatch_errors (display);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
}
\f
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)))
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);
XSendEvent (dpyinfo->display, wdest, propagate, mask, &event);
XFlush (dpyinfo->display);
}
- x_uncatch_errors (dpyinfo->display);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
return Qnil;
static int x_io_error_quitter P_ ((Display *));
void x_catch_errors P_ ((Display *));
-void x_uncatch_errors P_ ((Display *));
+void x_uncatch_errors P_ ((void));
void x_lower_frame P_ ((struct frame *));
void x_scroll_bar_clear P_ ((struct frame *));
int x_had_errors_p P_ ((Display *));
if (x_had_errors_p (FRAME_X_DISPLAY (*fp)))
f1 = 0;
- x_uncatch_errors (FRAME_X_DISPLAY (*fp));
+ x_uncatch_errors ();
/* If not, is it one of our scroll bars? */
if (! f1)
/* This is needed to detect the error
if there is an error. */
XSync (d, False);
- x_uncatch_errors (d);
+ x_uncatch_errors ();
}
/* Not certain about handling scroll bars here */
#endif /* 0 */
DPY should be the display that was passed to x_catch_errors. */
void
-x_uncatch_errors (dpy)
- Display *dpy;
+x_uncatch_errors ()
{
struct x_error_message_stack *tmp;
- eassert (x_error_message && dpy == x_error_message->dpy);
-
/* The display may have been closed before this function is called.
Check if it is still open before calling XSync. */
- if (x_display_info_for_display (dpy) != 0)
+ if (x_display_info_for_display (x_error_message->dpy) != 0)
{
BLOCK_INPUT;
- XSync (dpy, False);
+ XSync (x_error_message->dpy, False);
UNBLOCK_INPUT;
}
{
char string[X_ERROR_MESSAGE_SIZE];
bcopy (x_error_message->string, string, X_ERROR_MESSAGE_SIZE);
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
error (format, string);
}
}
if (dpyinfo)
x_delete_display (dpyinfo);
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
if (x_display_list == 0)
{
}
}
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
if (names)
thisinfo = NULL;
x_clear_errors (dpy);
}
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
if (thisinfo)
font = NULL;
x_clear_errors (FRAME_X_DISPLAY (f));
}
- x_uncatch_errors (FRAME_X_DISPLAY (f));
+ x_uncatch_errors ();
UNBLOCK_INPUT;
if (!font)
return NULL;
abort ();
if (x_had_errors_p (dpy) || !XQueryFont (dpy, font))
XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
}
#endif
#endif
void x_wm_set_size_hint P_ ((struct frame *, long, int));
void x_catch_errors P_ ((Display *));
int x_had_errors_p P_ ((Display *));
-void x_uncatch_errors P_ ((Display *));
+void x_uncatch_errors P_ ((void));
void x_check_errors P_ ((Display *, char *));
int x_text_icon P_ ((struct frame *, char *));
int x_bitmap_icon P_ ((struct frame *, Lisp_Object));
extern void x_catch_errors P_ ((Display *));
extern void x_check_errors P_ ((Display *, char *));
extern int x_had_errors_p P_ ((Display *));
-extern void x_uncatch_errors P_ ((Display *));
+extern void x_uncatch_errors P_ ((void));
extern void x_set_window_size P_ ((struct frame *, int, int, int));
extern void x_set_mouse_position P_ ((struct frame *, int, int));
extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));