1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00

Merge from origin/emacs-28

efd3ef3ceb ; * src/window.c: Fix some comments.  (Bug#58550)
This commit is contained in:
Stefan Kangas 2022-10-19 06:31:16 +02:00
commit e42a68720e

View File

@ -5441,12 +5441,13 @@ window_wants_mode_line (struct window *w)
* Return 1 if window W wants a header line and is high enough to
* accommodate it, 0 otherwise.
*
* W wants a header line if it's a leaf window and neither a minibuffer
* nor a pseudo window. Moreover, its 'window-mode-line-format'
* parameter must not be 'none' and either that parameter or W's
* buffer's 'mode-line-format' value must be non-nil. Finally, W must
* be higher than its frame's canonical character height and be able to
* accommodate a mode line too if necessary (the mode line prevails).
* W wants a header line if it's a leaf window and neither a
* minibuffer nor a pseudo window. Moreover, its
* 'window-header-line-format' parameter must not be 'none' and either
* that parameter or W's buffer's 'header-line-format' value must be
* non-nil. Finally, W must be higher than its frame's canonical
* character height and be able to accommodate a mode line too if
* necessary (the mode line prevails).
*/
bool
window_wants_header_line (struct window *w)
@ -5474,9 +5475,9 @@ window_wants_header_line (struct window *w)
* accommodate it, 0 otherwise.
*
* W wants a tab line if it's a leaf window and neither a minibuffer
* nor a pseudo window. Moreover, its 'window-mode-line-format'
* nor a pseudo window. Moreover, its 'window-tab-line-format'
* parameter must not be 'none' and either that parameter or W's
* buffer's 'mode-line-format' value must be non-nil. Finally, W must
* buffer's 'tab-line-format' value must be non-nil. Finally, W must
* be higher than its frame's canonical character height and be able
* to accommodate a mode line and a header line too if necessary (the
* mode line and a header line prevail).