changeset 109326:269057771f8c

Fix bug #6609. w32fns.c (x_set_foreground_color): Fix setting the cursor color when it's the same as the old foreground.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 14 Jul 2010 10:40:52 +0300
parents d916e52744cb
children 60266cf487b0
files src/ChangeLog src/w32fns.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jul 10 16:34:57 2010 -0700
+++ b/src/ChangeLog	Wed Jul 14 10:40:52 2010 +0300
@@ -1,3 +1,8 @@
+2010-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* 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  <cyd@stupidchicken.com>
 
 	* xfaces.c (realize_face): Garbage the frame if a face is removed
--- a/src/w32fns.c	Sat Jul 10 16:34:57 2010 -0700
+++ b/src/w32fns.c	Wed Jul 14 10:40:52 2010 +0300
@@ -1353,7 +1353,10 @@
   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))