procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #17969 with vertical-motion through continuation lines with TABs.

Browse source 
src/xdisp.c (move_it_to): Adjust calculation of line_start_x to what
 x_produce_glyphs does when it generates a stretch glyph that
 represents a TAB.
This commit is contained in:
Eli Zaretskii 2014-07-08 18:12:39 +03:00
parent 7acd41f38f
commit 9aac592d88
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-07-08 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (move_it_to): Adjust calculation of line_start_x to what
x_produce_glyphs does when it generates a stretch glyph that
represents a TAB. (Bug#17969)
2014-07-05 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (pos_visible_p): If CHARPOS is at beginning of window,

19
src/xdisp.c
View file

@ -9250,6 +9250,25 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
{
line_start_x = it->current_x + it->pixel_width
- it->last_visible_x;
if (FRAME_WINDOW_P (it->f))
{
struct face *face = FACE_FROM_ID (it->f, it->face_id);
struct font *face_font = face->font;
/* When display_line produces a continued line
that ends in a TAB, it skips a tab stop that
is closer than the font's space character
width (see x_produce_glyphs where it produces
the stretch glyph which represents a TAB).
We need to reproduce the same logic here. */
eassert (face_font);
if (face_font)
{
if (line_start_x < face_font->space_width)
line_start_x
+= it->tab_width * face_font->space_width;
}
}
set_iterator_to_next (it, 0);
}
}