Merge changes from master.

This commit is contained in:
Michael Grant
2025-12-08 14:30:57 +00:00
29 changed files with 536 additions and 176 deletions

View File

@@ -1851,7 +1851,7 @@ window_pane_mode(struct window_pane *wp)
int
window_pane_show_scrollbar(struct window_pane *wp, int sb_option)
{
if (SCREEN_IS_ALTERNATE(wp->screen))
if (SCREEN_IS_ALTERNATE(&wp->base))
return (0);
if (sb_option == PANE_SCROLLBARS_ALWAYS ||
(sb_option == PANE_SCROLLBARS_MODAL &&