From cef233eeb8366580f76e8324695e6f964cb160d0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 10 Feb 2017 18:19:11 +0200 Subject: [PATCH] Fix a bug with displaying an image after a TAB * src/xdisp.c (display_line): Handle TAB at end of screen line specially only when we are displaying characters. (Bug#25662) --- src/xdisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 387a3709722..6cb5b4e0562 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -20995,7 +20995,10 @@ display_line (struct it *it) up to the right margin of the window. */ extend_face_to_end_of_line (it); } - else if (it->c == '\t' && FRAME_WINDOW_P (it->f)) + else if ((it->what == IT_CHARACTER + || it->what == IT_STRETCH + || it->what == IT_COMPOSITION) + && it->c == '\t' && FRAME_WINDOW_P (it->f)) { /* A TAB that extends past the right edge of the window. This produces a single glyph on -- 2.39.5