]> git.eshelyaron.com Git - emacs.git/commit
Fix display of TABs in hscrolled windows with line numbers
authorEli Zaretskii <eliz@gnu.org>
Wed, 7 Mar 2018 18:40:44 +0000 (20:40 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jun 2018 09:15:14 +0000 (12:15 +0300)
commit8b2b4b580c38d7f1d95f8b2bf1f7c6ad8b9207b9
tree86b9e59b3c5dd47b01064035c45466ec59cb66b4
parentde69d28458e52487ebb9db47b100c23a16ab6093
Fix display of TABs in hscrolled windows with line numbers

* src/dispextern.h (struct it): New members tab_offset and
line_number_produced_p.
* src/xdisp.c (display_line): Don't set row->x to a negative value
if line numbers are being displayed.  (Bug#30582)
Reset the line_number_produced_p flag before laying out the glyph
row.
(x_produce_glyphs): Use the line_number_produced_p flag to decide
whether to offset the X coordinate due to line-number display.
Use the tab_offset member to restore the original TAB width for
alignment purposes.
(move_it_in_display_line_to): Don't produce line numbers when moving
in hscrolled window to the left of first_visible_x.
(maybe_produce_line_number): Set the line_number_produced_p flag.
(Bug#30584)
* src/term.c (produce_glyphs): Correct TAB width only when
line_number_produced_p flag is set.

(cherry picked from commit 1ac190553886ff20817d3dd218464e2fc6f9e42a)
src/dispextern.h
src/term.c
src/xdisp.c