master 7609c6cadb: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 7609c6cadb071df8eeded71263c66c5ca94860b3
Merge: 8fe3d46d35 69c56cbe6e
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    69c56cbe6e ; * src/w32notify.c: Fix a typo in a comment.
    3b9e60ba2f ; * src/window.c (Fset_window_start): Mention the effect o...
---
 src/w32notify.c | 4 ++--
 src/window.c    | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/w32notify.c b/src/w32notify.c
index e7d2f0f076..ccefecb659 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -40,8 +40,8 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
    and returns.  That causes the WaitForSingleObjectEx function call
    inside watch_worker to return, but the thread won't terminate until
    the event telling to do so will be signaled.  The completion
-   routine issued another call to ReadDirectoryChangesW as quickly as
-   possible.  (Except when it does not, see below.)
+   routine then issues another call to ReadDirectoryChangesW as quickly
+   as possible.  (Except when it does not, see below.)
 
    In a GUI session, the WM_EMACS_FILENOTIFY message posted to the
    message queue gets dispatched to the main Emacs window procedure,
diff --git a/src/window.c b/src/window.c
index 6d28384eeb..15d6cf94b0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1868,7 +1868,13 @@ point not visible in the window.
 For reliable setting of WINDOW start position, make sure point is
 at a position that will be visible when that start is in effect,
 otherwise there's a chance POS will be disregarded, e.g., if point
-winds up in a partially-visible line.  */)
+winds up in a partially-visible line.
+
+The setting of the WINDOW's start position takes effect during the
+next redisplay cycle, not immediately.  If NOFORCE is nil or
+omitted, forcing the display of WINDOW to start at POS cancels
+any setting of WINDOW's vertical scroll (\"vscroll\") amount
+set by `set-window-vscroll' and by scrolling functions.  */)
   (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce)
 {
   register struct window *w = decode_live_window (window);