From 2fbd491ff0a6154ead554ae80fac647f7f8cd4f7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Mar 2019 06:33:43 +0000
Subject: [PATCH 1/2] Add actual HPA (\033[`), the existing one is CHA. From
 Marc Reisner.

---
 input.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/input.c b/input.c
index 99174cd6..adc28eba 100644
--- a/input.c
+++ b/input.c
@@ -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);

From 1e9f8a3523ac93203036bd4a3740674a91fc4f1c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Mar 2019 06:36:21 +0000
Subject: [PATCH 2/2] Missing space in capture-pane usage, from Ben Boeckel.

Also man page fixed from jmc.
---
 cmd-capture-pane.c | 2 +-
 tmux.1             | 7 ++++---
 2 files changed, 5 insertions(+), 4 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 },
 
diff --git a/tmux.1 b/tmux.1
index df35d839..49e82643 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3724,9 +3724,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