From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 May 2024 11:23:43 +0000 (+0300)
Subject: Avoid assertion violations in displaying under 'outline-minor-mode'
X-Git-Tag: archive/raspbian/1%29.4+1-4+rpi1~1^2~2^2~17^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f0121f8dbe2ca0ec8fe2831353f01782e5e6b9d;p=emacs.git

Avoid assertion violations in displaying under 'outline-minor-mode'

* src/xdisp.c (init_from_display_pos): Initialize BYTEPOS
correctly, since 'init_iterator' no longer computes it from
CHARPOS as needed.  This fixes a change made on Mar 13, 2013.
(Bug#71194)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6e945ed114b..1b198df4076 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3876,7 +3876,7 @@ init_from_display_pos (struct it *it, struct window *w, struct display_pos *pos)
   if (in_ellipses_for_invisible_text_p (pos, w))
     {
       --charpos;
-      bytepos = 0;
+      bytepos = BYTE_TO_CHAR (charpos);
     }
 
   /* Keep in mind: the call to reseat in init_iterator skips invisible