circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-03-07 22:02:42 +00:00
parent a1009e7bd3 f98c66ece8
commit 349aeb806a
12 changed files with 638 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
format.c
View File

@@ -1551,7 +1551,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_in_mode", "%d", wp->screen != &wp->base);
if (wp->mode != NULL)
format_add(ft, "pane_mode", "%s", wp->mode->name);
format_add(ft, "pane_mode", "%s", wp->mode->mode->name);
format_add(ft, "pane_synchronized", "%d",
!!options_get_number(w->options, "synchronize-panes"));
@@ -1569,8 +1569,8 @@ 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);
if (wp->mode != NULL && wp->mode->formats != NULL)
wp->mode->formats(wp, ft);
if (wp->mode != NULL && wp->mode->mode->formats != NULL)
wp->mode->mode->formats(wp->mode, ft);
format_add(ft, "alternate_on", "%d", wp->saved_grid ? 1 : 0);
format_add(ft, "alternate_saved_x", "%u", wp->saved_cx);