(LIBS_MACHINE): Add -lelf.

[gnu-emacs] / src / w32fns.c

diff --git a/src/w32fns.c b/src/w32fns.c
index 67b45abcf602b0a90cbecb31b538c89485ae3d08..13de5fb75b361f82944c228255ca7df7462ff21d 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1529,6 +1529,7 @@ x_set_mouse_color (f, arg, oldval)
 #if 0
   Cursor cursor, nontext_cursor, mode_cursor, cross_cursor;
 #endif
+  int count;
   int mask_color;
 
   if (!EQ (Qnil, arg))
@@ -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;