diff options
author | Eli Zaretskii <eliz@gnu.org> | 2024-03-30 04:38:17 -0400 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2024-03-30 04:38:17 -0400 |
commit | b1e33b0b62115148909de4923b04eac49e1433d4 (patch) | |
tree | 5191054969df5bdb5aa1842f7ce0449a16f80733 /src | |
parent | 1284aa2655bfc21f973a1b6859138921c47ecc9e (diff) | |
parent | 38faacf353fb4c8efb027019a4619a386edfe62c (diff) | |
download | emacs-b1e33b0b62115148909de4923b04eac49e1433d4.tar.gz |
Merge from origin/emacs-29
38faacf353f Improve documentation of <Delete> in user manual
9d3d77f12da Fix documentation of 'other-window-for-scrolling'
Diffstat (limited to 'src')
-rw-r--r-- | src/window.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index 748ad9e77d4..fe26311fbb2 100644 --- a/src/window.c +++ b/src/window.c @@ -6504,13 +6504,16 @@ When calling from a program, supply as argument a number, nil, or `-'. */) } DEFUN ("other-window-for-scrolling", Fother_window_for_scrolling, Sother_window_for_scrolling, 0, 0, 0, - doc: /* Return the other window for \"other window scroll\" commands. -If in the minibuffer, `minibuffer-scroll-window' if non-nil -specifies the window. -Otherwise, if `other-window-scroll-buffer' is non-nil, a window -showing that buffer is used, popping the buffer up if necessary. -Finally, look for a neighboring window on the selected frame, -followed by all visible frames on the current terminal. */) + doc: /* Return \"the other\" window for \"other window scroll\" commands. +If in the minibuffer, and `minibuffer-scroll-window' is non-nil, +it specifies the window to use. +Otherwise, if `other-window-scroll-buffer' is a buffer, a window +showing that buffer is the window to use, popping it up if necessary. +Otherwise, if `other-window-scroll-default' is a function, call it, +and the window it returns is the window to use. +Finally, the function looks for a neighboring window on the selected +frame, followed by windows on all the visible frames on the current +terminal. */) (void) { Lisp_Object window; |