Mercurial > emacs
diff src/xfns.c @ 83483:8976b9f5eda1
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-120
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-121
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-122
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-123
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-124
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-125
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-126
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-127
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-40
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-41
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-42
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-523
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 28 Feb 2006 17:35:08 +0000 |
parents | 866effff65a4 fdee8318ddc9 |
children | f47495b26508 |
line wrap: on
line diff
--- a/src/xfns.c Sat Feb 25 01:07:18 2006 +0000 +++ b/src/xfns.c Tue Feb 28 17:35:08 2006 +0000 @@ -588,11 +588,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); @@ -679,7 +677,7 @@ had_errors = x_had_errors_p (FRAME_X_DISPLAY (f)); } - x_uncatch_errors (FRAME_X_DISPLAY (f), count); + x_uncatch_errors (); UNBLOCK_INPUT; @@ -957,7 +955,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; @@ -974,7 +971,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)) { @@ -1035,7 +1032,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 (); { XColor fore_color, back_color; @@ -3458,13 +3455,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 (); UNBLOCK_INPUT; return Qnil;