Mercurial > emacs
comparison src/w32fns.c @ 34089:445e01c537a3
Fix last change.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Fri, 01 Dec 2000 19:08:11 +0000 |
parents | 0044985507c7 |
children | f1063cc498e4 |
comparison
equal
deleted
inserted
replaced
34088:c7a6875bee92 | 34089:445e01c537a3 |
---|---|
2017 void | 2017 void |
2018 x_set_mouse_color (f, arg, oldval) | 2018 x_set_mouse_color (f, arg, oldval) |
2019 struct frame *f; | 2019 struct frame *f; |
2020 Lisp_Object arg, oldval; | 2020 Lisp_Object arg, oldval; |
2021 { | 2021 { |
2022 | |
2023 Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; | 2022 Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; |
2024 int count; | 2023 int count; |
2025 int mask_color; | 2024 int mask_color; |
2026 | 2025 |
2027 if (!EQ (Qnil, arg)) | 2026 if (!EQ (Qnil, arg)) |
2167 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel, | 2166 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel, |
2168 WHITE_PIX_DEFAULT (f)); | 2167 WHITE_PIX_DEFAULT (f)); |
2169 else | 2168 else |
2170 fore_pixel = FRAME_BACKGROUND_PIXEL (f); | 2169 fore_pixel = FRAME_BACKGROUND_PIXEL (f); |
2171 | 2170 |
2172 pixel = x_decode_color (f, arg, BLACK_PIXEL_DEFAULT (f)); | 2171 pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
2173 | 2172 |
2174 /* Make sure that the cursor color differs from the background color. */ | 2173 /* Make sure that the cursor color differs from the background color. */ |
2175 if (pixel == FRAME_BACKGROUND_PIXEL (f)) | 2174 if (pixel == FRAME_BACKGROUND_PIXEL (f)) |
2176 { | 2175 { |
2177 pixel = f->output_data.w32->mouse_pixel; | 2176 pixel = f->output_data.w32->mouse_pixel; |