aboutsummaryrefslogtreecommitdiff
path: root/tty.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-04-15 00:33:56 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-04-15 00:33:56 +0100
commit4abc8f717a5a786a4dd9e4f24d64ec76b0829993 (patch)
treed52bbbd572c1fb638ac60e75a43d92ede1955155 /tty.c
parent8e1cef404022422f9f57c72d139f19a82a70a791 (diff)
parent57c514d2f85f9d1c81601bae32131f1cd2948422 (diff)
downloadrtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.gz
rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.bz2
rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tty.c')
-rw-r--r--tty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tty.c b/tty.c
index eb2511c9..02b74ee6 100644
--- a/tty.c
+++ b/tty.c
@@ -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);