1 files changed, 7 insertions, 1 deletions

diff --git a/src/term.c b/src/term.c
index 3d7f4ada0b9..87a412666d0 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1585,10 +1585,16 @@ produce_glyphs (struct it *it)
     {
       int absolute_x = (it->current_x
                         + it->continuation_lines_width);
+      int x0 = absolute_x;
+      /* Adjust for line numbers.  */
+      if (!NILP (Vdisplay_line_numbers))
+        absolute_x -= it->lnum_pixel_width;
       int next_tab_x
         = (((1 + absolute_x + it->tab_width - 1)
             / it->tab_width)
            * it->tab_width);
+      if (!NILP (Vdisplay_line_numbers))
+        next_tab_x += it->lnum_pixel_width;
       int nspaces;
 
       /* If part of the TAB has been displayed on the previous line
@@ -1596,7 +1602,7 @@ produce_glyphs (struct it *it)
          been incremented already by the part that fitted on the
          continued line.  So, we will get the right number of spaces
          here.  */
-      nspaces = next_tab_x - absolute_x;
+      nspaces = next_tab_x - x0;
 
       if (it->glyph_row)
         {