Merge branch 'master' into feature-floating-window-panes

This commit is contained in:
Michael Grant
2025-12-06 21:14:38 +00:00
committed by GitHub
24 changed files with 249 additions and 151 deletions

View File

@@ -1826,7 +1826,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 &&