From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 3 May 1997 19:18:28 +0000 (+0000)
Subject: (x_set_mouse_color): Update calls to x_catch_errors
X-Git-Tag: emacs-20.1~2313
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fadca6c6a947396eb6f44f2e72a495d0681fcd67;p=emacs.git

(x_set_mouse_color): Update calls to x_catch_errors
and x_uncatch_errors.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 67b45abcf60..3a8a2eb1c3c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1528,6 +1528,7 @@ x_set_mouse_color (f, arg, oldval)
 {
 #if 0
   Cursor cursor, nontext_cursor, mode_cursor, cross_cursor;
+  int count;
 #endif
   int mask_color;
 
@@ -1544,7 +1545,7 @@ x_set_mouse_color (f, arg, oldval)
   BLOCK_INPUT;
 
   /* It's not okay to crash if the user selects a screwy cursor.  */
-  x_catch_errors (FRAME_W32_DISPLAY (f));
+  count = x_catch_errors (FRAME_W32_DISPLAY (f));
 
   if (!EQ (Qnil, Vx_pointer_shape))
     {
@@ -1587,7 +1588,7 @@ x_set_mouse_color (f, arg, oldval)
 
   /* Check and report errors with the above calls.  */
   x_check_errors (FRAME_W32_DISPLAY (f), "can't set cursor shape: %s");
-  x_uncatch_errors (FRAME_W32_DISPLAY (f));
+  x_uncatch_errors (FRAME_W32_DISPLAY (f), count);
 
   {
     XColor fore_color, back_color;