aboutsummaryrefslogtreecommitdiff
path: root/options-table.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-04-02 21:02:37 +0100
committerThomas Adam <thomas@xteddy.org>2019-04-02 21:02:37 +0100
commitc9ef144dcacb03645e04f262e107618fb103a7c1 (patch)
tree171552ce819482210fa748c73c36c6e0d0325c5b /options-table.c
parentf0ddc301b76fb7c048751892b1e5e63ec75f8deb (diff)
parent09f71ed1b24a875e2747583dee0008765df9e74f (diff)
downloadrtmux-c9ef144dcacb03645e04f262e107618fb103a7c1.tar.gz
rtmux-c9ef144dcacb03645e04f262e107618fb103a7c1.tar.bz2
rtmux-c9ef144dcacb03645e04f262e107618fb103a7c1.zip
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
-rw-r--r--options-table.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/options-table.c b/options-table.c
index 541e66f2..1301f92d 100644
--- a/options-table.c
+++ b/options-table.c
@@ -82,7 +82,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}}, " \
@@ -103,7 +104,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}}, " \