From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 21 Sep 2007 10:57:21 +0000 (+0000)
Subject: (x_draw_glyph_string): Use strike_through_color, not underline_color,
X-Git-Tag: emacs-pretest-23.0.90~10748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=def7fa3452d27173177227a674f02a949c3d7973;p=emacs.git

(x_draw_glyph_string): Use strike_through_color, not underline_color,
to draw strike-through.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 859409092b0..9867b64582e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-21  Juanma Barranquero  <lekktu@gmail.com>
+
+	* w32term.c (x_draw_glyph_string): Use strike_through_color, not
+	underline_color, to draw strike-through.
+
 2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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)
           unsigned long dy = 0, h = 1;
 
           if (s->face->overline_color_defaulted_p)
-        {
-          w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
+	    {
+	      w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
                          s->y + dy, s->background_width, h);
-        }
+	    }
           else
             {
               w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x,
@@ -2619,7 +2619,7 @@ x_draw_glyph_string (s)
             }
           else
             {
-              w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
+              w32_fill_area (s->f, s->hdc, s->face->strike_through_color, s->x,
                              s->y + dy, s->width, h);
             }
         }
@@ -6264,7 +6264,7 @@ static struct terminal *
 w32_create_terminal (struct w32_display_info *dpyinfo)
 {
   struct terminal *terminal;
-  
+
   terminal = create_terminal ();
 
   terminal->type = output_w32;
@@ -6295,7 +6295,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
 
   terminal->delete_frame_hook = x_destroy_window;
   terminal->delete_terminal_hook = x_delete_terminal;
-  
+
   terminal->rif = &w32_redisplay_interface;
   terminal->scroll_region_ok = 1;    /* We'll scroll partial frames. */
   terminal->char_ins_del_ok = 1;