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)

diff --git a/src/xdisp.c b/src/xdisp.c
index 387a370972269409b84cbb28ce6dca9184fb50c2..6cb5b4e05625c5b72f4db0d2899afd2f479d212d 100644 (file)
--- 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