Mercurial > emacs
comparison src/w32fns.c @ 109445:051595eb9b58
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 16 Jul 2010 11:42:15 -0400 |
| parents | 60516122d066 269057771f8c |
| children | 2dbdaf17fcfa |
comparison
equal
deleted
inserted
replaced
| 109443:9e514d1076b4 | 109445:051595eb9b58 |
|---|---|
| 1331 FRAME_FOREGROUND_PIXEL (f) = fg; | 1331 FRAME_FOREGROUND_PIXEL (f) = fg; |
| 1332 | 1332 |
| 1333 if (FRAME_W32_WINDOW (f) != 0) | 1333 if (FRAME_W32_WINDOW (f) != 0) |
| 1334 { | 1334 { |
| 1335 if (x->cursor_pixel == old_fg) | 1335 if (x->cursor_pixel == old_fg) |
| 1336 x->cursor_pixel = fg; | 1336 { |
| 1337 x->cursor_pixel = fg; | |
| 1338 x->cursor_gc->background = fg; | |
| 1339 } | |
| 1337 | 1340 |
| 1338 update_face_from_frame_parameter (f, Qforeground_color, arg); | 1341 update_face_from_frame_parameter (f, Qforeground_color, arg); |
| 1339 if (FRAME_VISIBLE_P (f)) | 1342 if (FRAME_VISIBLE_P (f)) |
| 1340 redraw_frame (f); | 1343 redraw_frame (f); |
| 1341 } | 1344 } |