(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef

Backport of commit 1b595b4598e7 since it turns out this "minor typo"
had disastrous consequences in pathological cases and explains
some of the problems seen in bug#71644 and bug#63040.

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

diff --git a/src/marker.c b/src/marker.c
index f016bf9c0889ce26176fbff9fe43ed3f51c32707..9aaa2e7402cbf4fe56accff4779de570e216c7d0 100644 (file)
--- 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;