diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
| commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch) | |
| tree | 852fa9fde3126091fa90ee6604097373076772b1 /tty.c | |
| parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff) | |
| parent | acef311fe356f408690e9f94727ed63a934b742f (diff) | |
| download | rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2 rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tty-keys.c
Diffstat (limited to 'tty.c')
| -rw-r--r-- | tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -128,7 +128,7 @@ tty_set_size(struct tty *tty, u_int sx, u_int sy) { } int -tty_open(struct tty *tty, const char *overrides, char **cause) +tty_open(struct tty *tty, char **cause) { char out[64]; int fd; @@ -141,7 +141,7 @@ tty_open(struct tty *tty, const char *overrides, char **cause) tty->log_fd = fd; } - tty->term = tty_term_find(tty->termname, tty->fd, overrides, cause); + tty->term = tty_term_find(tty->termname, tty->fd, cause); if (tty->term == NULL) { tty_close(tty); return (-1); |