From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 18 Apr 2014 08:35:09 +0000 (+0300)
Subject: Fix bug #17288 with inserting left truncation glyph under linum-mode.
X-Git-Tag: emacs-24.3.91~128
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea0ca0f45870e18517a234726e59fd7c6dbb4d15;p=emacs.git

Fix bug #17288 with inserting left truncation glyph under linum-mode.

 src/xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
 glyph is written to TEXT_AREA of the temporary glyph_row.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e8f122d3c76..e7b8384b431 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-18  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
+	glyph is written to TEXT_AREA of the temporary glyph_row.
+	(Bug#17288)
+
 2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* emacs.c (close_output_streams): Don't clear and restore errno.
diff --git a/src/xdisp.c b/src/xdisp.c
index ad5f6a6bf83..88d61a6bbc0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18688,6 +18688,7 @@ insert_left_trunc_glyphs (struct it *it)
   truncate_it.current_x = 0;
   truncate_it.face_id = DEFAULT_FACE_ID;
   truncate_it.glyph_row = &scratch_glyph_row;
+  truncate_it.area = TEXT_AREA;
   truncate_it.glyph_row->used[TEXT_AREA] = 0;
   CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1;
   truncate_it.object = make_number (0);