aboutsummaryrefslogtreecommitdiff
path: root/tty-keys.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-10-29 12:50:05 +0000
committerThomas Adam <thomas@xteddy.org>2014-10-29 12:51:21 +0000
commit35ffd093d724053046ae49984af0beb0530e5560 (patch)
treed5b89a213621dc56b852fc7eb8a1daba12046830 /tty-keys.c
parent201036ad80f2e51f7238db2adf05914a4a4f5819 (diff)
parent10a9440055ccdda5788965bcb048207eab2a0548 (diff)
downloadrtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.gz
rtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.bz2
rtmux-35ffd093d724053046ae49984af0beb0530e5560.zip
Merge branch 'obsd-master'
Conflicts: Makefile cmd-link-window.c cmd-unlink-window.c
Diffstat (limited to 'tty-keys.c')
-rw-r--r--tty-keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tty-keys.c b/tty-keys.c
index 557ecd55..bbcbedfb 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -382,7 +382,7 @@ tty_keys_build(struct tty *tty)
const char *s;
if (tty->key_tree != NULL)
- tty_keys_free (tty);
+ tty_keys_free(tty);
tty->key_tree = NULL;
for (i = 0; i < nitems(tty_default_raw_keys); i++) {