Merge from origin/emacs-27

71fc003860 (origin/emacs-27) Avoid infloop in 'format-mode-line'
247dcb4b1b Clarify the documentation of 'left/right-fringe' display spec
d453cee177 Minor improvement in ELisp manual
3c778c443c * doc/misc/tramp.texi (Customizing Methods): Fix typo.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 92afcccd388..97c55cdf5b8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26385,6 +26385,22 @@ decode_mode_spec (struct window *w, register int c, int field_width,
         startpos = marker_position (w->start);
         startpos_byte = marker_byte_position (w->start);
         height = WINDOW_TOTAL_LINES (w);
+        /* We cannot cope with w->start being outside of the
+           accessible portion of the buffer; in particular,
+           display_count_lines call below will infloop if called with
+           startpos_byte outside of the [BEGV_BYTE..ZV_BYTE] region.
+           Such w->start means we were called in some "creative" way
+           when the buffer's restriction was changed, but the window
+           wasn't yet redisplayed after that.  If that happens, we
+           need to determine a new base line.  */
+        if (!(BUF_BEGV_BYTE (b) <= startpos_byte
+              && startpos_byte <= BUF_ZV_BYTE (b)))
+          {
+            startpos = BUF_BEGV (b);
+            startpos_byte = BUF_BEGV_BYTE (b);
+            w->base_line_pos = 0;
+            w->base_line_number = 0;
+          }
 
         /* If we decided that this buffer isn't suitable for line numbers,
            don't forget that too fast.  */