(move_it_to): Correctly count tab glyphs for continued lines ending in

tab.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 909ec688aff..0a2b58761d8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6828,7 +6828,12 @@ move_it_to (it, to_charpos, to_x, to_y, to_vpos, op)
           break;
 
         case MOVE_LINE_CONTINUED:
-          it->continuation_lines_width += it->current_x;
+          /* For continued lines ending in a tab, some of the glyphs
+             associated with the tab are displayed on the current
+             line.  Since it->current_x does not include these glyphs,
+             we use it->last_visible_x instead.  */
+          it->continuation_lines_width +=
+            (it->c == '\t') ? it->last_visible_x : it->current_x;
           break;
 
         default: