aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2010-07-14 10:40:52 +0300
committerEli Zaretskii <[email protected]>2010-07-14 10:40:52 +0300
commit1f60c16a17e6a7be21192578e3147de5b313ee4b (patch)
tree17450422a6d45c74bcd00c4609b8f7124b08fab9 /src
parent3260caf88a9f6ea92c9e6cd2770c3db3b1864311 (diff)
Fix bug #6609.
w32fns.c (x_set_foreground_color): Fix setting the cursor color when it's the same as the old foreground.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b6fe8f8c5c..1d9d3927e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-14 Eli Zaretskii <[email protected]>
+
+ * w32fns.c (x_set_foreground_color): Fix setting the cursor color
+ when it's the same as the old foreground. (Bug#6609)
+
2010-07-10 Chong Yidong <[email protected]>
* xfaces.c (realize_face): Garbage the frame if a face is removed
diff --git a/src/w32fns.c b/src/w32fns.c
index 8fabb13fb8..9df243ede7 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1353,7 +1353,10 @@ x_set_foreground_color (f, arg, oldval)
if (FRAME_W32_WINDOW (f) != 0)
{
if (x->cursor_pixel == old_fg)
- x->cursor_pixel = fg;
+ {
+ x->cursor_pixel = fg;
+ x->cursor_gc->background = fg;
+ }
update_face_from_frame_parameter (f, Qforeground_color, arg);
if (FRAME_VISIBLE_P (f))