summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-05-03 19:18:28 +0000
committerRichard M. Stallman <rms@gnu.org>1997-05-03 19:18:28 +0000
commit2e37b2f193dc08ffa6aad066f65fde102b8e82c3 (patch)
tree7241268fc8238b34165bca9c7a3c6d37ddc46be6
parent147701028aee314e18dc105578b8e72d18e0f0b7 (diff)
downloademacs-2e37b2f193dc08ffa6aad066f65fde102b8e82c3.tar.gz
(x_set_mouse_color): Update calls to x_catch_errors
and x_uncatch_errors.
-rw-r--r--src/w32fns.c5
1 files changed, 3 insertions, 2 deletions
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;