diff options
| author | Philip Kaludercic | 2022-10-20 20:00:32 +0200 |
|---|---|---|
| committer | Philip Kaludercic | 2022-10-20 20:00:32 +0200 |
| commit | 37bfb623e4b253443e8280c3de4ff91f8db5f51b (patch) | |
| tree | 39e48d687ace2d9b88b10bf82412301c4e723743 /src/window.c | |
| parent | e08e9bc40f2c309bf119659a6496759493bd35e1 (diff) | |
| parent | 937ae0cf55d31c332fba3d96061e2ac3653e5437 (diff) | |
| download | emacs-37bfb623e4b253443e8280c3de4ff91f8db5f51b.tar.gz emacs-37bfb623e4b253443e8280c3de4ff91f8db5f51b.zip | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c index 4e8b352e164..f116b9a9d72 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5441,12 +5441,13 @@ window_wants_mode_line (struct window *w) | |||
| 5441 | * Return 1 if window W wants a header line and is high enough to | 5441 | * Return 1 if window W wants a header line and is high enough to |
| 5442 | * accommodate it, 0 otherwise. | 5442 | * accommodate it, 0 otherwise. |
| 5443 | * | 5443 | * |
| 5444 | * W wants a header line if it's a leaf window and neither a minibuffer | 5444 | * W wants a header line if it's a leaf window and neither a |
| 5445 | * nor a pseudo window. Moreover, its 'window-mode-line-format' | 5445 | * minibuffer nor a pseudo window. Moreover, its |
| 5446 | * parameter must not be 'none' and either that parameter or W's | 5446 | * 'window-header-line-format' parameter must not be 'none' and either |
| 5447 | * buffer's 'mode-line-format' value must be non-nil. Finally, W must | 5447 | * that parameter or W's buffer's 'header-line-format' value must be |
| 5448 | * be higher than its frame's canonical character height and be able to | 5448 | * non-nil. Finally, W must be higher than its frame's canonical |
| 5449 | * accommodate a mode line too if necessary (the mode line prevails). | 5449 | * character height and be able to accommodate a mode line too if |
| 5450 | * necessary (the mode line prevails). | ||
| 5450 | */ | 5451 | */ |
| 5451 | bool | 5452 | bool |
| 5452 | window_wants_header_line (struct window *w) | 5453 | window_wants_header_line (struct window *w) |
| @@ -5474,9 +5475,9 @@ window_wants_header_line (struct window *w) | |||
| 5474 | * accommodate it, 0 otherwise. | 5475 | * accommodate it, 0 otherwise. |
| 5475 | * | 5476 | * |
| 5476 | * W wants a tab line if it's a leaf window and neither a minibuffer | 5477 | * W wants a tab line if it's a leaf window and neither a minibuffer |
| 5477 | * nor a pseudo window. Moreover, its 'window-mode-line-format' | 5478 | * nor a pseudo window. Moreover, its 'window-tab-line-format' |
| 5478 | * parameter must not be 'none' and either that parameter or W's | 5479 | * parameter must not be 'none' and either that parameter or W's |
| 5479 | * buffer's 'mode-line-format' value must be non-nil. Finally, W must | 5480 | * buffer's 'tab-line-format' value must be non-nil. Finally, W must |
| 5480 | * be higher than its frame's canonical character height and be able | 5481 | * be higher than its frame's canonical character height and be able |
| 5481 | * to accommodate a mode line and a header line too if necessary (the | 5482 | * to accommodate a mode line and a header line too if necessary (the |
| 5482 | * mode line and a header line prevail). | 5483 | * mode line and a header line prevail). |