Merge branch 'obsd-master'

Conflicts:
	cfg.c
	tmux.c

1 files changed, 2 insertions, 2 deletions

diff --git a/alerts.c b/alerts.c
index cfdd30e3..5d52f7ad 100644
--- a/alerts.c
+++ b/alerts.c
@@ -174,7 +174,7 @@ alerts_check_bell(struct session *s, struct winlink *wl)
 			    (action == BELL_OTHER &&
 			    c->session->curw->window != w) ||
 			    action == BELL_ANY)
-				tty_bell(&c->tty);
+				tty_putcode(&c->tty, TTYC_BEL);
 			continue;
 		}
 		if (action == BELL_CURRENT && c->session->curw->window == w)
@@ -258,6 +258,6 @@ alerts_ring_bell(struct session *s)
 
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->session == s && !(c->flags & CLIENT_CONTROL))
-			tty_bell(&c->tty);
+			tty_putcode(&c->tty, TTYC_BEL);
 	}
 }