From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 10 Feb 2017 16:19:11 +0000 (+0200)
Subject: Fix a bug with displaying an image after a TAB
X-Git-Tag: emacs-26.0.90~848^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cef233eeb8366580f76e8324695e6f964cb160d0;p=emacs.git

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 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