Merge branch 'obsd-master' into master

3 files changed, 11 insertions, 5 deletions

diff --git a/key-string.c b/key-string.c
index 406d26dd..4f7be858 100644
--- a/key-string.c
+++ b/key-string.c
@@ -183,6 +183,8 @@ key_string_lookup_string(const char *string)
 	if (string[0] == '0' && string[1] == 'x') {
 		if (sscanf(string + 2, "%x", &u) != 1)
 			return (KEYC_UNKNOWN);
+		if (u < 32)
+			return (u);
 		mlen = wctomb(m, u);
 		if (mlen <= 0 || mlen > MB_LEN_MAX)
 			return (KEYC_UNKNOWN);
diff --git a/options-table.c b/options-table.c
index 101490e7..2555147a 100644
--- a/options-table.c
+++ b/options-table.c
@@ -367,7 +367,7 @@ const struct options_table_entry options_table[] = {
 	  .maximum = INT_MAX,
 	  .default_num = 1,
 	  .unit = "milliseconds",
-	  .text = "Maximum time between input to assume it pasting rather "
+	  .text = "Maximum time between input to assume it is pasting rather "
 		  "than typing."
 	},
 
@@ -614,7 +614,7 @@ const struct options_table_entry options_table[] = {
 	  .text = "Formats for the status lines. "
 		  "Each array member is the format for one status line. "
 		  "The default status line is made up of several components "
-		  "which may be configured individually with other option such "
+		  "which may be configured individually with other options such "
 		  "as 'status-left'."
 	},
 
@@ -951,7 +951,8 @@ const struct options_table_entry options_table[] = {
 	  .scope = OPTIONS_TABLE_WINDOW,
 	  .choices = options_table_pane_lines_list,
 	  .default_num = PANE_LINES_SINGLE,
-	  .text = "Type of the pane type lines."
+	  .text = "Type of characters used to draw pane border lines. Some of "
+	          "these are only supported on terminals with UTF-8 support."
 	},
 
 	{ .name = "pane-border-status",
diff --git a/tmux.1 b/tmux.1
index 89d28a9c..c96ba532 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2102,9 +2102,11 @@ The following keys may be used in tree mode:
 .It Li "q" Ta "Exit mode"
 .El
 .Pp
-After a session, window or pane is chosen,
+After a session, window or pane is chosen, the first instance of
 .Ql %%
-is replaced by the target in
+and all instances of
+.Ql %1
+are replaced by the target in
 .Ar template
 and the result executed as a command.
 If
@@ -4331,6 +4333,7 @@ see the
 .Sx STYLES
 section.
 .El
+.El
 .Sh HOOKS
 .Nm
 allows commands to run on various triggers, called