aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-06-28 10:01:16 +0100
committerThomas Adam <thomas@xteddy.org>2017-06-28 10:01:16 +0100
commit1ca920bbebd5fb418089752aa595e4e5696e28bc (patch)
treea58679e48452906c4022ef34841746460d9e69f2
parent6995497e5b66e090f25e85fbb207f033f7790199 (diff)
parent1e376be13d3ed6bd850b15d0292d73d47ad07e94 (diff)
downloadrtmux-1ca920bbebd5fb418089752aa595e4e5696e28bc.tar.gz
rtmux-1ca920bbebd5fb418089752aa595e4e5696e28bc.tar.bz2
rtmux-1ca920bbebd5fb418089752aa595e4e5696e28bc.zip
Merge branch 'obsd-master'
-rw-r--r--alerts.c3
-rw-r--r--tmux.14
2 files changed, 3 insertions, 4 deletions
diff --git a/alerts.c b/alerts.c
index 6696369f..a489d444 100644
--- a/alerts.c
+++ b/alerts.c
@@ -285,8 +285,7 @@ alerts_check_silence(struct window *w)
if (options_get_number(s->options, "bell-on-alert"))
alerts_ring_bell(s);
-
- if (!options_get_number(s->options, "visual-silence"))
+ if (options_get_number(s->options, "visual-silence"))
alerts_set_message(s, "Silence in window %d", wl->idx);
}
diff --git a/tmux.1 b/tmux.1
index d5d4a995..693e66c4 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2870,8 +2870,8 @@ command).
.It Ic user-keys[] Ar key
Set list of user-defined key escape sequences.
Each item is associated with a key named
-.Ql User0,
-.Ql User1,
+.Ql User0 ,
+.Ql User1 ,
and so on.
.Pp
For example: