[Emacs-diffs] emacs-24 r116872: Adjust image background width on X11 accordingly when its x position is adjusted. (Bug#17115)

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 116872
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17115
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-03-28 09:50:53 +0900
message:
  Adjust image background width on X11 accordingly when its x position is 
adjusted. (Bug#17115)
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-27 16:25:17 +0000
+++ b/src/ChangeLog     2014-03-28 00:50:53 +0000
@@ -1,3 +1,8 @@
+2014-03-28  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32term.c (x_draw_image_glyph_string): Fix computation of height

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-03-21 10:14:10 +0000
+++ b/src/xterm.c       2014-03-28 00:50:53 +0000
@@ -2402,15 +2402,19 @@
        {
          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;