Merge branch 'obsd-master'

Conflicts:
	cfg.c
	tmux.c

1 files changed, 0 insertions, 15 deletions

diff --git a/tty.c b/tty.c
index 374fb8c6..c4dfde1d 100644
--- a/tty.c
+++ b/tty.c
@@ -233,7 +233,6 @@ tty_start_tty(struct tty *tty)
 			tty->flags |= TTY_FOCUS;
 			tty_puts(tty, "\033[?1004h");
 		}
-		tty_puts(tty, "\033[c");
 	}
 
 	tty->cx = UINT_MAX;
@@ -254,14 +253,6 @@ tty_start_tty(struct tty *tty)
 }
 
 void
-tty_set_class(struct tty *tty, u_int class)
-{
-	if (tty->class != 0)
-		return;
-	tty->class = class;
-}
-
-void
 tty_stop_tty(struct tty *tty)
 {
 	struct winsize	ws;
@@ -1721,9 +1712,3 @@ tty_default_colours(struct grid_cell *gc, const struct window_pane *wp)
 		}
 	}
 }
-
-void
-tty_bell(struct tty *tty)
-{
-	tty_putcode(tty, TTYC_BEL);
-}