Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-03-14 08:02:37 +00:00
3 changed files with 8 additions and 6 deletions

View File

@ -41,7 +41,7 @@ const struct cmd_entry cmd_capture_pane_entry = {
.args = { "ab:CeE:JpPqS:t:", 0, 0 }, .args = { "ab:CeE:JpPqS:t:", 0, 0 },
.usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] " .usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] "
"[-S start-line]" CMD_TARGET_PANE_USAGE, "[-S start-line] " CMD_TARGET_PANE_USAGE,
.target = { 't', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_PANE, 0 },

View File

@ -272,6 +272,7 @@ static const struct input_table_entry input_csi_table[] = {
{ 'S', "", INPUT_CSI_SU }, { 'S', "", INPUT_CSI_SU },
{ 'X', "", INPUT_CSI_ECH }, { 'X', "", INPUT_CSI_ECH },
{ 'Z', "", INPUT_CSI_CBT }, { 'Z', "", INPUT_CSI_CBT },
{ '`', "", INPUT_CSI_HPA },
{ 'b', "", INPUT_CSI_REP }, { 'b', "", INPUT_CSI_REP },
{ 'c', "", INPUT_CSI_DA }, { 'c', "", INPUT_CSI_DA },
{ 'c', ">", INPUT_CSI_DA_TWO }, { 'c', ">", INPUT_CSI_DA_TWO },
@ -1471,7 +1472,7 @@ input_csi_dispatch(struct input_ctx *ictx)
case INPUT_CSI_HPA: case INPUT_CSI_HPA:
n = input_get(ictx, 0, 1, 1); n = input_get(ictx, 0, 1, 1);
if (n != -1) if (n != -1)
screen_write_cursormove(sctx, n - 1, -1, 0); screen_write_cursormove(sctx, n - 1, -1, 1);
break; break;
case INPUT_CSI_ICH: case INPUT_CSI_ICH:
n = input_get(ictx, 0, 1, 1); n = input_get(ictx, 0, 1, 1);
@ -1540,7 +1541,7 @@ input_csi_dispatch(struct input_ctx *ictx)
case INPUT_CSI_VPA: case INPUT_CSI_VPA:
n = input_get(ictx, 0, 1, 1); n = input_get(ictx, 0, 1, 1);
if (n != -1) if (n != -1)
screen_write_cursormove(sctx, -1, n - 1, 0); screen_write_cursormove(sctx, -1, n - 1, 1);
break; break;
case INPUT_CSI_DECSCUSR: case INPUT_CSI_DECSCUSR:
n = input_get(ictx, 0, 0, 0); n = input_get(ictx, 0, 0, 0);

7
tmux.1
View File

@ -3826,9 +3826,10 @@ option rather than the content itself.
or or
.Ql P: .Ql P:
will loop over each session, window or pane and insert the format once will loop over each session, window or pane and insert the format once
for each. For windows and panes, two comma-separated formats may be for each.
given, the second is used for the current window or active pane. For For windows and panes, two comma-separated formats may be given:
example to get a list of windows formatted like the status line: the second is used for the current window or active pane.
For example, to get a list of windows formatted like the status line:
.Bd -literal -offset indent .Bd -literal -offset indent
#{W:#{E:window-status-format} ,#{E:window-status-current-format} } #{W:#{E:window-status-format} ,#{E:window-status-current-format} }
.Ed .Ed