From eff87c2c1ddadddd7b177d91a59be6a218b8bf37 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sat, 17 Jun 1995 14:58:24 +0000
Subject: [PATCH] (display_text_line): Fill in charstart for end of buffer.

---
 src/xdisp.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 2fcd4b08bf0..8565968589e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2614,7 +2614,18 @@ display_text_line (w, start, vpos, hpos, taboffset)
 	  /* Did we hit the end of the visible region of the buffer?
 	     Stop here.  */
 	  if (pos >= ZV)
-	    break;
+	    {
+	      /* Update charstarts for the end of this line.  */
+	      /* Do nothing if off the left edge or at the right edge.  */
+	      if (p1 >= leftmargin && p1 + 1 != endp)
+		{
+		  int *p2x = &charstart[(p1 < leftmargin
+					 ? leftmargin : p1)
+					- p1start];
+		  *p2x++ = pos;
+		}
+	      break;
+	    }
 
 #ifdef HAVE_FACES
 	  /* Did we hit a face change?  Figure out what face we should
-- 
2.39.2