summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-04-02 18:41:24 +0000
committernicm <nicm@openbsd.org>2019-04-02 18:41:24 +0000
commitb33b5bd5eea7a90bd1bd73fc1d949a9669a3ee75 (patch)
tree98ce5ab53ad159fb2005b09b67b59462eab83bd1
parentClarify preposition (diff)
downloadwireguard-openbsd-b33b5bd5eea7a90bd1bd73fc1d949a9669a3ee75.tar.xz
wireguard-openbsd-b33b5bd5eea7a90bd1bd73fc1d949a9669a3ee75.zip
Silence flag should use the same option as activity, reported by Thomas
Sattler.
-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}}, " \