diff options
| author | Juanma Barranquero | 2007-09-21 10:57:21 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-09-21 10:57:21 +0000 |
| commit | def7fa3452d27173177227a674f02a949c3d7973 (patch) | |
| tree | 56857287db66b15b4a4450c54fa10662c4f5d28b /src | |
| parent | 273f164cc4d8c1ad649442f6459c698ccdde3c3c (diff) | |
| download | emacs-def7fa3452d27173177227a674f02a949c3d7973.tar.gz emacs-def7fa3452d27173177227a674f02a949c3d7973.zip | |
(x_draw_glyph_string): Use strike_through_color, not underline_color,
to draw strike-through.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32term.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 859409092b0..9867b64582e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-09-21 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32term.c (x_draw_glyph_string): Use strike_through_color, not | ||
| 4 | underline_color, to draw strike-through. | ||
| 5 | |||
| 1 | 2007-09-21 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-09-21 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * lisp.h (allocate_terminal): Declare. | 8 | * lisp.h (allocate_terminal): Declare. |
diff --git a/src/w32term.c b/src/w32term.c index 23e2a7f8dac..b072c900cac 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -2594,10 +2594,10 @@ x_draw_glyph_string (s) | |||
| 2594 | unsigned long dy = 0, h = 1; | 2594 | unsigned long dy = 0, h = 1; |
| 2595 | 2595 | ||
| 2596 | if (s->face->overline_color_defaulted_p) | 2596 | if (s->face->overline_color_defaulted_p) |
| 2597 | { | 2597 | { |
| 2598 | w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, | 2598 | w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, |
| 2599 | s->y + dy, s->background_width, h); | 2599 | s->y + dy, s->background_width, h); |
| 2600 | } | 2600 | } |
| 2601 | else | 2601 | else |
| 2602 | { | 2602 | { |
| 2603 | w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x, | 2603 | w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x, |
| @@ -2619,7 +2619,7 @@ x_draw_glyph_string (s) | |||
| 2619 | } | 2619 | } |
| 2620 | else | 2620 | else |
| 2621 | { | 2621 | { |
| 2622 | w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, | 2622 | w32_fill_area (s->f, s->hdc, s->face->strike_through_color, s->x, |
| 2623 | s->y + dy, s->width, h); | 2623 | s->y + dy, s->width, h); |
| 2624 | } | 2624 | } |
| 2625 | } | 2625 | } |
| @@ -6264,7 +6264,7 @@ static struct terminal * | |||
| 6264 | w32_create_terminal (struct w32_display_info *dpyinfo) | 6264 | w32_create_terminal (struct w32_display_info *dpyinfo) |
| 6265 | { | 6265 | { |
| 6266 | struct terminal *terminal; | 6266 | struct terminal *terminal; |
| 6267 | 6267 | ||
| 6268 | terminal = create_terminal (); | 6268 | terminal = create_terminal (); |
| 6269 | 6269 | ||
| 6270 | terminal->type = output_w32; | 6270 | terminal->type = output_w32; |
| @@ -6295,7 +6295,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo) | |||
| 6295 | 6295 | ||
| 6296 | terminal->delete_frame_hook = x_destroy_window; | 6296 | terminal->delete_frame_hook = x_destroy_window; |
| 6297 | terminal->delete_terminal_hook = x_delete_terminal; | 6297 | terminal->delete_terminal_hook = x_delete_terminal; |
| 6298 | 6298 | ||
| 6299 | terminal->rif = &w32_redisplay_interface; | 6299 | terminal->rif = &w32_redisplay_interface; |
| 6300 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ | 6300 | terminal->scroll_region_ok = 1; /* We'll scroll partial frames. */ |
| 6301 | terminal->char_ins_del_ok = 1; | 6301 | terminal->char_ins_del_ok = 1; |