(x_draw_stretch_glyph_string): It is ok to draw a

stretch	glyph in left marginal areas on	header and mode lines.

3 files changed, 9 insertions, 3 deletions

diff --git a/src/macterm.c b/src/macterm.c
index 69612302774..97e3b743469 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -3583,7 +3583,9 @@ x_draw_stretch_glyph_string (s)
       int background_width = s->background_width;
       int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
 
-      if (x < left_x)
+      /* Don't draw into left margin, fringe or scrollbar area
+         except for header line and mode line.  */
+      if (x < left_x && !s->row->mode_line_p)
         {
           background_width -= left_x - x;
           x = left_x;
diff --git a/src/w32term.c b/src/w32term.c
index 294059aa77b..5e33c3af7b9 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2418,7 +2418,9 @@ x_draw_stretch_glyph_string (s)
       int background_width = s->background_width;
       int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
 
-      if (x < left_x)
+      /* Don't draw into left margin, fringe or scrollbar area
+         except for header line and mode line.  */
+      if (x < left_x && !s->row->mode_line_p)
         {
           background_width -= left_x - x;
           x = left_x;
diff --git a/src/xterm.c b/src/xterm.c
index 6fb9ee28f42..9cea615ca1e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2589,7 +2589,9 @@ x_draw_stretch_glyph_string (s)
       int background_width = s->background_width;
       int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
 
-      if (x < left_x)
+      /* Don't draw into left margin, fringe or scrollbar area
+         except for header line and mode line.  */
+      if (x < left_x && !s->row->mode_line_p)
         {
           background_width -= left_x - x;
           x = left_x;