master f6040018c5: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit f6040018c5e281ee31a3e499f43f29fbf1e817e9
Merge: 06cec5ee0b 970190b844
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    970190b844 Avoid infloop in 'recenter'
    a866674b2a Fix inaccuracies in "lax search" documentation
---
 doc/emacs/search.texi | 12 +++++++-----
 src/window.c          |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index f4e12d29e9..27d4db8541 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1428,16 +1428,18 @@ of its accented cousins like @code{@"a} and @code{@'a}, 
i.e., the
 match disregards the diacritics that distinguish these
 variants.  In addition, @code{a} matches other characters that
 resemble it, or have it as part of their graphical representation,
-such as U+249C @sc{parenthesized latin small letter a} and U+2100
-@sc{account of} (which looks like a small @code{a} over @code{c}).
+such as U+00AA @sc{feminine ordinal indicator} and U+24D0
+@sc{circled latin small letter a} (which looks like a small @code{a}
+inside a circle).
 Similarly, the @acronym{ASCII} double-quote character @code{"} matches
 all the other variants of double quotes defined by the Unicode
 standard.  Finally, character folding can make a sequence of one or
 more characters match another sequence of a different length: for
 example, the sequence of two characters @code{ff} matches U+FB00
-@sc{latin small ligature ff}.  Character sequences that are not identical,
-but match under character folding are known as @dfn{equivalent
-character sequences}.
+@sc{latin small ligature ff} and the sequence @code{(a)} matches
+U+249C @sc{parenthesized latin small letter a}.  Character sequences
+that are not identical, but match under character folding are known as
+@dfn{equivalent character sequences}.
 
 @kindex M-s ' @r{(Incremental Search)}
 @findex isearch-toggle-char-fold
diff --git a/src/window.c b/src/window.c
index 3cd2f98a85..33a1b8a4bf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6687,7 +6687,7 @@ and redisplay normally--don't erase and redraw the frame. 
 */)
             considered to be part of the visible height of the line.
          */
          h += extra_line_spacing;
-         while (-it.current_y > h)
+         while (-it.current_y > h && it.what != IT_EOB)
            move_it_by_lines (&it, 1);
 
          charpos = IT_CHARPOS (it);