From 64c276c23bd729c03c2a3ff00c6f9e6ac4c644c6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 10 Jun 2021 07:24:10 +0000
Subject: Add an "always" value to the extended-keys option to always forward
 these keys to applications inside tmux.

---
 options-table.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 8ea56918..4f4d9ff6 100644
--- a/options-table.c
+++ b/options-table.c
@@ -75,6 +75,9 @@ static const char *options_table_remain_on_exit_list[] = {
 static const char *options_table_detach_on_destroy_list[] = {
 	"off", "on", "no-detached", NULL
 };
+static const char *options_table_extended_keys_list[] = {
+	"off", "on", "always", NULL
+};
 
 /* Status line format. */
 #define OPTIONS_TABLE_STATUS_FORMAT1 \
@@ -267,8 +270,9 @@ const struct options_table_entry options_table[] = {
 	},
 
 	{ .name = "extended-keys",
-	  .type = OPTIONS_TABLE_FLAG,
+	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_SERVER,
+	  .choices = options_table_extended_keys_list,
 	  .default_num = 0,
 	  .text = "Whether to request extended key sequences from terminals "
 	          "that support it."
-- 
cgit 


From 866117636e47c9a5d961df2ac40456b7c910a932 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 10 Jun 2021 07:50:03 +0000
Subject: Add different command historys for different types of prompts
 ("command", "search" etc). From Anindya Mukherjee.

---
 options-table.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 4f4d9ff6..73c7fd63 100644
--- a/options-table.c
+++ b/options-table.c
@@ -302,6 +302,15 @@ const struct options_table_entry options_table[] = {
 	  .text = "Maximum number of server messages to keep."
 	},
 
+	{ .name = "prompt-history-limit",
+	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SERVER,
+	  .minimum = 0,
+	  .maximum = INT_MAX,
+	  .default_num = 100,
+	  .text = "Maximum number of commands to keep in history."
+	},
+
 	{ .name = "set-clipboard",
 	  .type = OPTIONS_TABLE_CHOICE,
 	  .scope = OPTIONS_TABLE_SERVER,
-- 
cgit 


From 77b1290698e3bc3ea8edeadb96fd483af26efdfe Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 10 Jun 2021 07:56:47 +0000
Subject: More accurate vi(1) word navigation in copy mode and on the status
 line. This changes the meaning of the word-separators option - setting it to
 the empty string is equivalent to the previous behavior. From Will Noble in
 GitHub issue 2693.

---
 options-table.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 73c7fd63..01880d62 100644
--- a/options-table.c
+++ b/options-table.c
@@ -755,7 +755,11 @@ const struct options_table_entry options_table[] = {
 	{ .name = "word-separators",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_SESSION,
-	  .default_str = " ",
+	  /*
+	   * The set of non-alphanumeric printable ASCII characters minus the
+	   * underscore.
+	   */
+	  .default_str = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~",
 	  .text = "Characters considered to separate words."
 	},
 
-- 
cgit 


From a83fb8127a6995a92b1f4954e397be9e5ee3c9a0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 16 Jun 2021 11:57:04 +0000
Subject: Minor fixes to option descriptions.

---
 options-table.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 01880d62..da1d8776 100644
--- a/options-table.c
+++ b/options-table.c
@@ -368,7 +368,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."
 	},
 
@@ -615,7 +615,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'."
 	},
 
@@ -952,7 +952,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",
-- 
cgit