Partial fix of hscroll of truncated lines with line numbers

* src/xdisp.c (x_produce_glyphs, hscroll_window_tree): Adjust
hscroll calculations to line-number display.
* src/term.c (produce_glyphs): Adjust tab stop to window's
hscroll.  These two changes fix horizontal scrolling when line
numbers are displayed.  But there's still a bug: the horizontal
shift of lines that begin with a TAB is different from the rest.
* src/xdisp.c (move_it_in_display_line_to): Call
should_produce_line_number to determine whether a line number
should be produced for this screen line.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/term.c b/src/term.c
index b0e7e052e51..46d8bff73cc 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1587,7 +1587,7 @@ produce_glyphs (struct it *it)
       /* Adjust for line numbers.  Kludge alert: the "2" below is
          because we add 2 blanks to the actual line number.  */
       if (!NILP (Vdisplay_line_numbers))
-        absolute_x -= it->lnum_width + 2;
+        absolute_x -= it->lnum_width + 2 - it->w->hscroll;
       int next_tab_x
         = (((1 + absolute_x + it->tab_width - 1)
             / it->tab_width)