From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 27 Jun 2024 19:36:28 +0000 (-0400)
Subject: (buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f86b1be5a68eaabae6e5aa62ad8ae3d28085ddb5;p=emacs.git

(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef

* src/marker.c (buf_bytepos_to_charpos): Don't compare byte-positions
with char-positions.

(cherry picked from commit b595b4598e7b3dabe4d45895f5580c9a351f2885)
---

diff --git a/src/marker.c b/src/marker.c
index f016bf9c088..9aaa2e7402c 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -358,11 +358,11 @@ buf_bytepos_to_charpos (struct buffer *b, ptrdiff_t bytepos)
     {
       CONSIDER (tail->bytepos, tail->charpos);
 
-      /* If we are down to a range of 50 chars,
+      /* If we are down to a range of DISTANCE bytes,
 	 don't bother checking any other markers;
 	 scan the intervening chars directly now.  */
-      if (best_above - bytepos < distance
-          || bytepos - best_below < distance)
+      if (best_above_byte - bytepos < distance
+          || bytepos - best_below_byte < distance)
 	break;
       else
         distance += BYTECHAR_DISTANCE_INCREMENT;