2 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c24451c459..a0f46f028c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xterm.c (x_draw_image_glyph_string): Adjust image background
+        width accordingly when its x position is adjusted.  (Bug#17115)
+
 2014-03-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * w32term.c (x_draw_image_glyph_string): Fix computation of height
diff --git a/src/xterm.c b/src/xterm.c
index fc61fb248ef..6fea807c975 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2402,15 +2402,19 @@ x_draw_image_glyph_string (struct glyph_string *s)
         {
           int x = s->x;
           int y = s->y;
+          int width = s->background_width;
 
           if (s->first_glyph->left_box_line_p
               && s->slice.x == 0)
-            x += box_line_hwidth;
+            {
+              x += box_line_hwidth;
+              width -= box_line_hwidth;
+            }
 
           if (s->slice.y == 0)
             y += box_line_vwidth;
 
-          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;