Merge from origin/emacs-27

f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix.  (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos

# Conflicts:
#	etc/NEWS
#	lisp/arc-mode.el

1 files changed, 3 insertions, 2 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index ecd23e0d0fc..152946363ed 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22824,10 +22824,11 @@ display_count_lines_visually (struct it *it)
           SET_TEXT_POS (from, PT, PT_BYTE);
           to = IT_CHARPOS (*it);
         }
-      start_display (&tem_it, it->w, from);
       /* Need to disable visual mode temporarily, since otherwise the
-         call to move_it_to will cause infinite recursion.  */
+         call to move_it_to below and inside start_display will cause
+         infinite recursion.  */
       specbind (Qdisplay_line_numbers, Qrelative);
+      start_display (&tem_it, it->w, from);
       /* Some redisplay optimizations could invoke us very far from
          PT, which will make the caller painfully slow.  There should
          be no need to go too far beyond the window's bottom, as any