Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-03-31 10:01:29 +01:00
9 changed files with 129 additions and 110 deletions

View File

@ -2745,9 +2745,11 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "scroll_region_upper", "%u", wp->base.rupper);
format_add(ft, "scroll_region_lower", "%u", wp->base.rlower);
format_add(ft, "alternate_on", "%d", wp->saved_grid ? 1 : 0);
format_add(ft, "alternate_saved_x", "%u", wp->saved_cx);
format_add(ft, "alternate_saved_y", "%u", wp->saved_cy);
format_add(ft, "alternate_on", "%d", wp->base.saved_grid != NULL);
if (wp->base.saved_cx != UINT_MAX)
format_add(ft, "alternate_saved_x", "%u", wp->base.saved_cx);
if (wp->base.saved_cy != UINT_MAX)
format_add(ft, "alternate_saved_y", "%u", wp->base.saved_cy);
format_add(ft, "cursor_flag", "%d",
!!(wp->base.mode & MODE_CURSOR));