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...
This commit is contained in:
Stefan Kangas 2022-05-06 06:30:28 +02:00
commit 7609c6cadb
2 changed files with 9 additions and 3 deletions

View file

@ -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,

View file

@ -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);