Mercurial > emacs

changeset 17609:8c878d76d6a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_real_positions, x_set_mouse_color, Fx_list_fonts): Save value from x_catch_errors and pass to x_uncatch_errors.
author Richard M. Stallman <rms@gnu.org>
date Thu, 01 May 1997 01:59:47 +0000
parents 23baa4f48b6e
children f95fbf6f1234
files src/xfns.c
diffstat 1 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfns.c	Thu May 01 01:58:47 1997 +0000
+++ b/src/xfns.c	Thu May 01 01:59:47 1997 +0000
@@ -968,7 +968,7 @@
 
   while (1)
     {
-      x_catch_errors (FRAME_X_DISPLAY (f));
+      int count = x_catch_errors (FRAME_X_DISPLAY (f));
 
       XQueryTree (FRAME_X_DISPLAY (f), outer, &tmp_root_window,
 		  &f->output_data.x->parent_desc,
@@ -1010,11 +1010,11 @@
 	 Detect that and try the whole thing over.  */
       if (! x_had_errors_p (FRAME_X_DISPLAY (f)))
 	{
-	  x_uncatch_errors (FRAME_X_DISPLAY (f));
+	  x_uncatch_errors (FRAME_X_DISPLAY (f), count);
 	  break;
 	}
 
-      x_uncatch_errors (FRAME_X_DISPLAY (f));
+      x_uncatch_errors (FRAME_X_DISPLAY (f), count);
     }
 
   *xptr = f->output_data.x->left_pos - win_x;
@@ -1266,6 +1266,7 @@
      Lisp_Object arg, oldval;
 {
   Cursor cursor, nontext_cursor, mode_cursor, cross_cursor;
+  int count;
   int mask_color;
 
   if (!EQ (Qnil, arg))
@@ -1280,7 +1281,7 @@
   BLOCK_INPUT;
 
   /* It's not okay to crash if the user selects a screwy cursor.  */
-  x_catch_errors (FRAME_X_DISPLAY (f));
+  count = x_catch_errors (FRAME_X_DISPLAY (f));
 
   if (!EQ (Qnil, Vx_pointer_shape))
     {
@@ -1323,7 +1324,7 @@
 
   /* Check and report errors with the above calls.  */
   x_check_errors (FRAME_X_DISPLAY (f), "can't set cursor shape: %s");
-  x_uncatch_errors (FRAME_X_DISPLAY (f));
+  x_uncatch_errors (FRAME_X_DISPLAY (f), count);
 
   {
     XColor fore_color, back_color;
@@ -3427,6 +3428,7 @@
   FRAME_PTR f;
   Lisp_Object key;
   int maxnames;
+  int count;
 
   check_x ();
   CHECK_STRING (pattern, 0);
@@ -3492,13 +3494,13 @@
 	{
 	  XFontStruct *thisinfo;
 
-	  x_catch_errors (FRAME_X_DISPLAY (f));
+	  count = x_catch_errors (FRAME_X_DISPLAY (f));
 
 	  thisinfo = XLoadQueryFont (FRAME_X_DISPLAY (f),
 				     XSTRING (XCONS (tem)->car)->data);
 
 	  x_check_errors (FRAME_X_DISPLAY (f), "XLoadQueryFont failure: %s");
-	  x_uncatch_errors (FRAME_X_DISPLAY (f));
+	  x_uncatch_errors (FRAME_X_DISPLAY (f), count);
 
 	  if (thisinfo && same_size_fonts (thisinfo, size_ref))
 	    newlist = Fcons (XCONS (tem)->car, newlist);
@@ -3514,7 +3516,7 @@
 
   BLOCK_INPUT;
 
-  x_catch_errors (FRAME_X_DISPLAY (f));
+  count = x_catch_errors (FRAME_X_DISPLAY (f));
 
   /* Solaris 2.3 has a bug in XListFontsWithInfo.  */
 #ifndef BROKEN_XLISTFONTSWITHINFO
@@ -3532,7 +3534,7 @@
 			&num_fonts); /* count_return */
 
   x_check_errors (FRAME_X_DISPLAY (f), "XListFonts failure: %s");
-  x_uncatch_errors (FRAME_X_DISPLAY (f));
+  x_uncatch_errors (FRAME_X_DISPLAY (f), count);
 
   UNBLOCK_INPUT;
 
@@ -3567,11 +3569,11 @@
 
 	      BLOCK_INPUT;
 
-	      x_catch_errors (FRAME_X_DISPLAY (f));
+	      count = x_catch_errors (FRAME_X_DISPLAY (f));
 	      thisinfo = XLoadQueryFont (FRAME_X_DISPLAY (f), names[i]);
 	      x_check_errors (FRAME_X_DISPLAY (f),
 			      "XLoadQueryFont failure: %s");
-	      x_uncatch_errors (FRAME_X_DISPLAY (f));
+	      x_uncatch_errors (FRAME_X_DISPLAY (f), count);
 
 	      UNBLOCK_INPUT;