[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c |
Date: |
Sat, 25 Feb 2006 23:20:11 +0000 |
Index: emacs/src/xfns.c
diff -u emacs/src/xfns.c:1.659 emacs/src/xfns.c:1.660
--- emacs/src/xfns.c:1.659 Tue Feb 21 08:36:38 2006
+++ emacs/src/xfns.c Sat Feb 25 23:20:10 2006
@@ -577,11 +577,9 @@
int had_errors = 0;
Window win = f->output_data.x->parent_desc;
- int count;
-
BLOCK_INPUT;
- count = x_catch_errors (FRAME_X_DISPLAY (f));
+ x_catch_errors (FRAME_X_DISPLAY (f));
if (win == FRAME_X_DISPLAY_INFO (f)->root_window)
win = FRAME_OUTER_WINDOW (f);
@@ -668,7 +666,7 @@
had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
}
- x_uncatch_errors (FRAME_X_DISPLAY (f), count);
+ x_uncatch_errors (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
@@ -946,7 +944,6 @@
Display *dpy = FRAME_X_DISPLAY (f);
Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
Cursor hourglass_cursor, horizontal_drag_cursor;
- int count;
unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
unsigned long mask_color = x->background_pixel;
@@ -963,7 +960,7 @@
BLOCK_INPUT;
/* It's not okay to crash if the user selects a screwy cursor. */
- count = x_catch_errors (dpy);
+ x_catch_errors (dpy);
if (!NILP (Vx_pointer_shape))
{
@@ -1024,7 +1021,7 @@
/* Check and report errors with the above calls. */
x_check_errors (dpy, "can't set cursor shape: %s");
- x_uncatch_errors (dpy, count);
+ x_uncatch_errors (dpy);
{
XColor fore_color, back_color;
@@ -3441,13 +3438,12 @@
{
struct frame *f = check_x_frame (frame);
Display *dpy = FRAME_X_DISPLAY (f);
- int count;
BLOCK_INPUT;
- count = x_catch_errors (dpy);
+ x_catch_errors (dpy);
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
RevertToParent, CurrentTime);
- x_uncatch_errors (dpy, count);
+ x_uncatch_errors (dpy);
UNBLOCK_INPUT;
return Qnil;