summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/options-table.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-04-02 18:41:25 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-04-02 18:41:25 +0000
commitae128fb09feb76c0a576e454163a8867b7d9d8b5 (patch)
treef662c96868b0e6f8a02082d59583ae9ce7048b87 /usr.bin/tmux/options-table.c
parentc13778d2bd4884977832ac0239cf8c9fa054e2bd (diff)
Silence flag should use the same option as activity, reported by Thomas
Sattler.
Diffstat (limited to 'usr.bin/tmux/options-table.c')
-rw-r--r--usr.bin/tmux/options-table.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 1b16ac39961..46738c71144 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.101 2019/03/19 21:09:51 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.102 2019/04/02 18:41:24 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -83,7 +83,8 @@ static const char *options_table_window_size_list[] = {
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
- "#{?#{&&:#{window_activity_flag}," \
+ "#{?#{&&:#{||:#{window_activity_flag}," \
+ "#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \
@@ -104,7 +105,8 @@ static const char *options_table_window_size_list[] = {
"#{?#{&&:#{window_bell_flag}," \
"#{!=:#{window-status-bell-style},default}}, " \
"#{window-status-bell-style}," \
- "#{?#{&&:#{window_activity_flag}," \
+ "#{?#{&&:#{||:#{window_activity_flag}," \
+ "#{window_silence_flag}}," \
"#{!=:" \
"#{window-status-activity-style}," \
"default}}, " \