Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org

1 files changed, 12 insertions, 4 deletions

diff --git a/src/w32term.c b/src/w32term.c
index e8ec99e762d..256d7506a3a 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2085,10 +2085,14 @@ x_draw_image_glyph_string (struct glyph_string *s)
   int x, y;
   int box_line_hwidth = eabs (s->face->box_line_width);
   int box_line_vwidth = max (s->face->box_line_width, 0);
-  int height;
+  int height, width;
   HBITMAP pixmap = 0;
 
-  height = s->height - 2 * box_line_vwidth;
+  height = s->height;
+  if (s->slice.y == 0)
+    height -= box_line_vwidth;
+  if (s->slice.y + s->slice.height >= s->img->height)
+    height -= box_line_vwidth;
 
   /* Fill background with face under the image.  Do it only if row is
      taller than image or if image has a clip mask to reduce
@@ -2101,10 +2105,14 @@ x_draw_image_glyph_string (struct glyph_string *s)
       || s->img->pixmap == 0
       || s->width != s->background_width)
     {
+      width = s->background_width;
       x = s->x;
       if (s->first_glyph->left_box_line_p
           && s->slice.x == 0)
-        x += box_line_hwidth;
+        {
+          x += box_line_hwidth;
+          width -= box_line_hwidth;
+        }
 
       y = s->y;
       if (s->slice.y == 0)
@@ -2150,7 +2158,7 @@ x_draw_image_glyph_string (struct glyph_string *s)
         }
       else
 #endif
-        x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height);
+        x_draw_glyph_string_bg_rect (s, x, y, width, height);
 
       s->background_filled_p = 1;
     }