diff options
| author | Richard M. Stallman | 1997-05-03 19:18:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-05-03 19:18:28 +0000 |
| commit | fadca6c6a947396eb6f44f2e72a495d0681fcd67 (patch) | |
| tree | 143c4ad488fac5b93eaabcdd92750e9c0b221452 /src | |
| parent | 0a01a04eeeb0810e214ae385e231936a6207c88c (diff) | |
| download | emacs-fadca6c6a947396eb6f44f2e72a495d0681fcd67.tar.gz emacs-fadca6c6a947396eb6f44f2e72a495d0681fcd67.zip | |
(x_set_mouse_color): Update calls to x_catch_errors
and x_uncatch_errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 5 |
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) | |||
| 1528 | { | 1528 | { |
| 1529 | #if 0 | 1529 | #if 0 |
| 1530 | Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; | 1530 | Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; |
| 1531 | int count; | ||
| 1531 | #endif | 1532 | #endif |
| 1532 | int mask_color; | 1533 | int mask_color; |
| 1533 | 1534 | ||
| @@ -1544,7 +1545,7 @@ x_set_mouse_color (f, arg, oldval) | |||
| 1544 | BLOCK_INPUT; | 1545 | BLOCK_INPUT; |
| 1545 | 1546 | ||
| 1546 | /* It's not okay to crash if the user selects a screwy cursor. */ | 1547 | /* It's not okay to crash if the user selects a screwy cursor. */ |
| 1547 | x_catch_errors (FRAME_W32_DISPLAY (f)); | 1548 | count = x_catch_errors (FRAME_W32_DISPLAY (f)); |
| 1548 | 1549 | ||
| 1549 | if (!EQ (Qnil, Vx_pointer_shape)) | 1550 | if (!EQ (Qnil, Vx_pointer_shape)) |
| 1550 | { | 1551 | { |
| @@ -1587,7 +1588,7 @@ x_set_mouse_color (f, arg, oldval) | |||
| 1587 | 1588 | ||
| 1588 | /* Check and report errors with the above calls. */ | 1589 | /* Check and report errors with the above calls. */ |
| 1589 | x_check_errors (FRAME_W32_DISPLAY (f), "can't set cursor shape: %s"); | 1590 | x_check_errors (FRAME_W32_DISPLAY (f), "can't set cursor shape: %s"); |
| 1590 | x_uncatch_errors (FRAME_W32_DISPLAY (f)); | 1591 | x_uncatch_errors (FRAME_W32_DISPLAY (f), count); |
| 1591 | 1592 | ||
| 1592 | { | 1593 | { |
| 1593 | XColor fore_color, back_color; | 1594 | XColor fore_color, back_color; |