[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99924: Fix bug #6609.

[Eli Zaretskii]

------------------------------------------------------------
revno: 99924
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-07-14 10:40:52 +0300
message:
  Fix bug #6609.
  
   w32fns.c (x_set_foreground_color): Fix setting the cursor color
   when it's the same as the old foreground.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-10 17:58:29 +0000
+++ b/src/ChangeLog     2010-07-14 07:40:52 +0000
@@ -1,3 +1,8 @@
+2010-07-14  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xfaces.c (realize_face): Garbage the frame if a face is removed

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2010-07-04 00:59:56 +0000
+++ b/src/w32fns.c      2010-07-14 07:40:52 +0000
@@ -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))