Merge branch 'obsd-master' into master

2 files changed, 19 insertions, 19 deletions

diff --git a/options-table.c b/options-table.c
index 1e90a7ba..76c2b053 100644
--- a/options-table.c
+++ b/options-table.c
@@ -80,7 +80,7 @@ static const char *options_table_extended_keys_list[] = {
 
 /* Status line format. */
 #define OPTIONS_TABLE_STATUS_FORMAT1 \
-	"#[align=left range=left #{status-left-style}]" \
+	"#[align=left range=left #{E:status-left-style}]" \
 	"#[push-default]" \
 	"#{T;=/#{status-left-length}:status-left}" \
 	"#[pop-default]" \
@@ -89,20 +89,20 @@ static const char *options_table_extended_keys_list[] = {
 	"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
 	"#{W:" \
 		"#[range=window|#{window_index} " \
-			"#{window-status-style}" \
+			"#{E:window-status-style}" \
 			"#{?#{&&:#{window_last_flag}," \
-				"#{!=:#{window-status-last-style},default}}, " \
-				"#{window-status-last-style}," \
+				"#{!=:#{E:window-status-last-style},default}}, " \
+				"#{E:window-status-last-style}," \
 			"}" \
 			"#{?#{&&:#{window_bell_flag}," \
-				"#{!=:#{window-status-bell-style},default}}, " \
-				"#{window-status-bell-style}," \
+				"#{!=:#{E:window-status-bell-style},default}}, " \
+				"#{E:window-status-bell-style}," \
 				"#{?#{&&:#{||:#{window_activity_flag}," \
 					     "#{window_silence_flag}}," \
 					"#{!=:" \
-					"#{window-status-activity-style}," \
+					"#{E:window-status-activity-style}," \
 					"default}}, " \
-					"#{window-status-activity-style}," \
+					"#{E:window-status-activity-style}," \
 				"}" \
 			"}" \
 		"]" \
@@ -113,23 +113,23 @@ static const char *options_table_extended_keys_list[] = {
 		"#{?window_end_flag,,#{window-status-separator}}" \
 	"," \
 		"#[range=window|#{window_index} list=focus " \
-			"#{?#{!=:#{window-status-current-style},default}," \
-				"#{window-status-current-style}," \
-				"#{window-status-style}" \
+			"#{?#{!=:#{E:window-status-current-style},default}," \
+				"#{E:window-status-current-style}," \
+				"#{E:window-status-style}" \
 			"}" \
 			"#{?#{&&:#{window_last_flag}," \
-				"#{!=:#{window-status-last-style},default}}, " \
-				"#{window-status-last-style}," \
+				"#{!=:#{E:window-status-last-style},default}}, " \
+				"#{E:window-status-last-style}," \
 			"}" \
 			"#{?#{&&:#{window_bell_flag}," \
-				"#{!=:#{window-status-bell-style},default}}, " \
-				"#{window-status-bell-style}," \
+				"#{!=:#{E:window-status-bell-style},default}}, " \
+				"#{E:window-status-bell-style}," \
 				"#{?#{&&:#{||:#{window_activity_flag}," \
 					     "#{window_silence_flag}}," \
 					"#{!=:" \
-					"#{window-status-activity-style}," \
+					"#{E:window-status-activity-style}," \
 					"default}}, " \
-					"#{window-status-activity-style}," \
+					"#{E:window-status-activity-style}," \
 				"}" \
 			"}" \
 		"]" \
@@ -139,7 +139,7 @@ static const char *options_table_extended_keys_list[] = {
 		"#[norange list=on default]" \
 		"#{?window_end_flag,,#{window-status-separator}}" \
 	"}" \
-	"#[nolist align=right range=right #{status-right-style}]" \
+	"#[nolist align=right range=right #{E:status-right-style}]" \
 	"#[push-default]" \
 	"#{T;=/#{status-right-length}:status-right}" \
 	"#[pop-default]" \
diff --git a/style.c b/style.c
index 24b09882..89a4e63a 100644
--- a/style.c
+++ b/style.c
@@ -51,7 +51,7 @@ int
 style_parse(struct style *sy, const struct grid_cell *base, const char *in)
 {
 	struct style	saved;
-	const char	delimiters[] = " ,", *cp;
+	const char	delimiters[] = " ,\n", *cp;
 	char		tmp[256], *found;
 	int		value;
 	size_t		end;