From 992ef70fb696d648b3ec6ed97642fd79a8392baf Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Apr 2014 07:36:45 +0000
Subject: Remove the monitor-content option and associated bits and bobs. It's
 never worked very well. If there is a big demand for it to return, will
 consider better ways to do it.

---
 options-table.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index bc25573a..a46f5ce6 100644
--- a/options-table.c
+++ b/options-table.c
@@ -491,11 +491,6 @@ const struct options_table_entry session_options_table[] = {
 	  .default_num = 0
 	},
 
-	{ .name = "visual-content",
-	  .type = OPTIONS_TABLE_FLAG,
-	  .default_num = 0
-	},
-
 	{ .name = "visual-silence",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .default_num = 0
@@ -629,11 +624,6 @@ const struct options_table_entry window_options_table[] = {
 	  .default_num = 0
 	},
 
-	{ .name = "monitor-content",
-	  .type = OPTIONS_TABLE_STRING,
-	  .default_str = ""
-	},
-
 	{ .name = "monitor-silence",
 	  .type = OPTIONS_TABLE_NUMBER,
 	  .minimum = 0,
@@ -735,29 +725,6 @@ const struct options_table_entry window_options_table[] = {
 	  .style = "window-status-style"
 	},
 
-	{ .name = "window-status-content-attr",
-	  .type = OPTIONS_TABLE_ATTRIBUTES,
-	  .default_num = GRID_ATTR_REVERSE,
-	  .style = "window-status-content-style"
-	},
-
-	{ .name = "window-status-content-bg",
-	  .type = OPTIONS_TABLE_COLOUR,
-	  .default_num = 8,
-	  .style = "window-status-content-style"
-	},
-
-	{ .name = "window-status-content-fg",
-	  .type = OPTIONS_TABLE_COLOUR,
-	  .default_num = 8,
-	  .style = "window-status-content-style"
-	},
-
-	{ .name = "window-status-content-style",
-	  .type = OPTIONS_TABLE_STYLE,
-	  .default_str = "reverse"
-	},
-
 	{ .name = "window-status-current-attr",
 	  .type = OPTIONS_TABLE_ATTRIBUTES,
 	  .default_num = 0,
-- 
cgit 


From 2740490e279bac7b01f18cc39aa59a5de09e3a95 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Apr 2014 07:55:43 +0000
Subject: Remove the "info" message mechanism, this was only used for about
 five mostly useless and annoying messages. Change those commands to silence
 on success like all the others. Still accept the -q command line flag and
 "quiet" server option for now.

---
 options-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index a46f5ce6..1010e84f 100644
--- a/options-table.c
+++ b/options-table.c
@@ -90,7 +90,7 @@ const struct options_table_entry server_options_table[] = {
 
 	{ .name = "quiet",
 	  .type = OPTIONS_TABLE_FLAG,
-	  .default_num = 0 /* overridden in main() */
+	  .default_num = 0
 	},
 
 	{ .name = "set-clipboard",
-- 
cgit 


From bce952777a491c5099693e2c256a14e51aecfaa6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Apr 2014 11:38:35 +0000
Subject: Remove some unnecessary includes and fix a typo.

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

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index 1010e84f..abeae7af 100644
--- a/options-table.c
+++ b/options-table.c
@@ -28,8 +28,8 @@
  * options. These tables are the master copy of the options with their real
  * (user-visible) types, range limits and default values. At start these are
  * copied into the runtime global options trees (which only has number and
- * string types). These tables are then used to loop up the real type when
- * the user sets an option or its value needs to be shown.
+ * string types). These tables are then used to look up the real type when the
+ * user sets an option or its value needs to be shown.
  */
 
 /* Choice option type lists. */
-- 
cgit 


From c3b2e5eed3b3ad4fd33cf011c5f4de6d25c602c0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Apr 2014 12:57:28 +0000
Subject: Wrap some long lines.

---
 options-table.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'options-table.c')

diff --git a/options-table.c b/options-table.c
index abeae7af..d68a41c3 100644
--- a/options-table.c
+++ b/options-table.c
@@ -528,7 +528,8 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "automatic-rename-format",
 	  .type = OPTIONS_TABLE_STRING,
-	  .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}#{?pane_dead,[dead],}"
+	  .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}"
+	                 "#{?pane_dead,[dead],}"
 	},
 
 	{ .name = "c0-change-trigger",
-- 
cgit