[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Mon, 27 Feb 2006 03:35:32 +0000 |
Index: emacs/src/xterm.c
diff -u emacs/src/xterm.c:1.899 emacs/src/xterm.c:1.900
--- emacs/src/xterm.c:1.899 Sat Feb 25 23:20:10 2006
+++ emacs/src/xterm.c Mon Feb 27 03:35:31 2006
@@ -325,7 +325,7 @@
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 *));
@@ -3795,7 +3795,7 @@
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)
@@ -5721,7 +5721,7 @@
/* 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 */
@@ -7529,19 +7529,16 @@
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;
}
@@ -7566,7 +7563,7 @@
{
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);
}
}
@@ -7726,7 +7723,7 @@
if (dpyinfo)
x_delete_display (dpyinfo);
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
if (x_display_list == 0)
{
@@ -9452,7 +9449,7 @@
}
}
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
if (names)
@@ -9553,7 +9550,7 @@
thisinfo = NULL;
x_clear_errors (dpy);
}
- x_uncatch_errors (dpy);
+ x_uncatch_errors ();
UNBLOCK_INPUT;
if (thisinfo)
@@ -9756,7 +9753,7 @@
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;
@@ -10541,7 +10538,7 @@
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
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2006/02/09
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2006/02/13
- [Emacs-diffs] Changes to emacs/src/xterm.c, Richard M. Stallman, 2006/02/13
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2006/02/14
- [Emacs-diffs] Changes to emacs/src/xterm.c, Richard M. Stallman, 2006/02/19
- [Emacs-diffs] Changes to emacs/src/xterm.c, Chong Yidong, 2006/02/25
- [Emacs-diffs] Changes to emacs/src/xterm.c,
Chong Yidong <=