summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-02-10 18:19:11 +0200
committerEli Zaretskii <eliz@gnu.org>2017-02-10 18:19:11 +0200
commitcef233eeb8366580f76e8324695e6f964cb160d0 (patch)
treeffa47a385da59ee4e6cbce96ef225938f8618aed /src
parent65298ff4d5861cbc8d88162d58c18fa972b81acf (diff)
downloademacs-cef233eeb8366580f76e8324695e6f964cb160d0.tar.gz
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)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c5
1 files changed, 4 insertions, 1 deletions
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