summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2013-03-21 18:45:39 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2013-03-21 18:45:39 +0000
commit2a0ba084e0f8e0c21558eead3b0097b600021666 (patch)
treeca94c61afb9ed801c47139e24d34e4d77f44826d
parent975bac8de4bdae4fb4db368c1bf690b8cdc890f4 (diff)
Don't set key KEYC_NONE on xterm_keys_find match()
When calling xterm_keys_find(); if we get a complete match, don't set the key to unknown before calling the action to complete the binding; otherwise non-prefixed bindings will not work. From Thomas Adam
-rw-r--r--usr.bin/tmux/tty-keys.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index 840cfc52f35..cb363906087 100644
--- a/usr.bin/tmux/tty-keys.c
+++ b/usr.bin/tmux/tty-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.51 2013/03/21 18:44:47 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.52 2013/03/21 18:45:38 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -473,7 +473,6 @@ tty_keys_next(struct tty *tty)
/* Try to parse a key with an xterm-style modifier. */
switch (xterm_keys_find(buf, len, &size, &key)) {
case 0: /* found */
- key = KEYC_NONE;
goto complete_key;
case -1: /* not found */
break;