Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-07-06 09:02:24 +01:00
commit 6f2698004e
2 changed files with 2 additions and 0 deletions

1
tmux.1
View File

@ -3786,6 +3786,7 @@ The following variables are available, where appropriate:
.It Li "pane_tty" Ta "" Ta "Pseudo terminal of pane"
.It Li "pane_width" Ta "" Ta "Width of pane"
.It Li "pid" Ta "" Ta "Server PID"
.It Li "rectangle_toggle" Ta "" Ta "1 if rectangle selection is activated"
.It Li "scroll_region_lower" Ta "" Ta "Bottom of scroll region in pane"
.It Li "scroll_region_upper" Ta "" Ta "Top of scroll region in pane"
.It Li "scroll_position" Ta "" Ta "Scroll position in copy mode"

View File

@ -2447,6 +2447,7 @@ window_copy_add_formats(struct window_pane *wp, struct format_tree *ft)
format_add(ft, "selection_present", "%d", data->screen.sel.flag);
format_add(ft, "scroll_position", "%d", data->oy);
format_add(ft, "rectangle_toggle", "%d", data->rectflag);
}
static void