diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-14 08:02:37 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-14 08:02:37 +0000 |
| commit | f33d2ab29ec62fc6c918f5927b9b680dc54fc3c6 (patch) | |
| tree | 7b1857291caed12c08228943d361d30fed5be674 | |
| parent | 81b393a4931037e604975682a2706f4447f06475 (diff) | |
| parent | 1e9f8a3523ac93203036bd4a3740674a91fc4f1c (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-capture-pane.c | 2 | ||||
| -rw-r--r-- | input.c | 5 | ||||
| -rw-r--r-- | tmux.1 | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index dd1576c4..a3ec066c 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -41,7 +41,7 @@ const struct cmd_entry cmd_capture_pane_entry = { .args = { "ab:CeE:JpPqS:t:", 0, 0 }, .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 }, @@ -272,6 +272,7 @@ static const struct input_table_entry input_csi_table[] = { { 'S', "", INPUT_CSI_SU }, { 'X', "", INPUT_CSI_ECH }, { 'Z', "", INPUT_CSI_CBT }, + { '`', "", INPUT_CSI_HPA }, { 'b', "", INPUT_CSI_REP }, { 'c', "", INPUT_CSI_DA }, { 'c', ">", INPUT_CSI_DA_TWO }, @@ -1471,7 +1472,7 @@ input_csi_dispatch(struct input_ctx *ictx) case INPUT_CSI_HPA: n = input_get(ictx, 0, 1, 1); if (n != -1) - screen_write_cursormove(sctx, n - 1, -1, 0); + screen_write_cursormove(sctx, n - 1, -1, 1); break; case INPUT_CSI_ICH: n = input_get(ictx, 0, 1, 1); @@ -1540,7 +1541,7 @@ input_csi_dispatch(struct input_ctx *ictx) case INPUT_CSI_VPA: n = input_get(ictx, 0, 1, 1); if (n != -1) - screen_write_cursormove(sctx, -1, n - 1, 0); + screen_write_cursormove(sctx, -1, n - 1, 1); break; case INPUT_CSI_DECSCUSR: n = input_get(ictx, 0, 0, 0); @@ -3826,9 +3826,10 @@ option rather than the content itself. or .Ql P: 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 -given, the second is used for the current window or active pane. For -example to get a list of windows formatted like the status line: +for each. +For windows and panes, two comma-separated formats may be given: +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 #{W:#{E:window-status-format} ,#{E:window-status-current-format} } .Ed |