From: Gregory Heytings <gregory@heytings.org>
Date: Fri, 29 Jul 2022 08:22:03 +0000 (+0200)
Subject: Merge branch 'feature/long-lines-and-font-locking'
X-Git-Tag: emacs-29.0.90~1447^2~675
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db03eda6369a9d4af3c72a8ab6ec29e3cc58acc4;p=emacs.git

Merge branch 'feature/long-lines-and-font-locking'
---

db03eda6369a9d4af3c72a8ab6ec29e3cc58acc4
diff --cc etc/NEWS
index b6d22fdf2b5,2d1ca8e98dd..43f057a407b
--- a/etc/NEWS
+++ b/etc/NEWS
@@@ -2514,12 -2459,16 +2520,19 @@@ and can be used as a more detailed alte
  ** 'save-some-buffers' can now be extended to save other things.
  Traditionally, 'save-some-buffers' saved buffers, and also saved
  abbrevs.  This has been generalized via the
 -'save-some-buffers-functions', and packages can now register things to
 -be saved.
 +'save-some-buffers-functions' variable, and packages can now register
 +things to be saved.
 +
 +** New function 'string-equal-ignore-case'.
 +This compares strings ignoring case differences.
  
+ +++
+ ** New argument LOCK of 'narrow-to-region'.
+ If 'narrow-to-region' is called from Lisp with the new optional
+ argument LOCK non-nil, then calls to 'widen' and calls to
+ 'narrow-to-region' with the optional argument LOCK nil or omitted do
+ not produce any effect until the end of the current body form.
+ 
  ** Themes
  
  ---
diff --cc src/xdisp.c
index e998df32a6a,e13d68eab9d..2c889586cd6
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -18930,14 -19101,12 +19101,15 @@@ set_vertical_scroll_bar (struct window 
  	  && NILP (echo_area_buffer[0])))
      {
        struct buffer *buf = XBUFFER (w->contents);
 -      ptrdiff_t window_end_pos = w->window_end_pos;
 +
 +      whole = BUF_ZV (buf) - BUF_BEGV (buf);
 +      start = marker_position (w->start) - BUF_BEGV (buf);
 +      end = BUF_Z (buf) - w->window_end_pos - BUF_BEGV (buf);
  
        /* If w->window_end_pos cannot be trusted, recompute it "the
- 	 hard way".  */
-       if (!MINI_WINDOW_P (w))
+ 	 hard way".  But don't bother to be too accurate when
+ 	 long-line shortcuts are in effect.  */
+       if (!w->window_end_valid && !buf->long_line_optimizations_p)
  	{
  	  struct it it;
  	  struct text_pos start_pos;