diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
| commit | b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (patch) | |
| tree | 8704cc16b1ed5380bcd7c678351d85adfd5907c8 /tty-keys.c | |
| parent | 8edbbb98656a76f0a25b5243b526709a67ae3531 (diff) | |
| parent | 81db6bab91309e7cb42628048408c10504522a48 (diff) | |
| download | rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.gz rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.bz2 rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.1
tmux.c
Diffstat (limited to 'tty-keys.c')
| -rw-r--r-- | tty-keys.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -479,6 +479,15 @@ tty_keys_next(struct tty *tty) goto partial_key; } + /* Look for matching key string and return if found. */ + tk = tty_keys_find(tty, buf, len, &size); + if (tk != NULL) { + if (tk->next != NULL) + goto partial_key; + key = tk->key; + goto complete_key; + } + /* Try to parse a key with an xterm-style modifier. */ switch (xterm_keys_find(buf, len, &size, &key)) { case 0: /* found */ @@ -489,15 +498,6 @@ tty_keys_next(struct tty *tty) goto partial_key; } - /* Look for matching key string and return if found. */ - tk = tty_keys_find(tty, buf, len, &size); - if (tk != NULL) { - if (tk->next != NULL) - goto partial_key; - key = tk->key; - goto complete_key; - } - first_key: /* Is this a meta key? */ if (len >= 2 && buf[0] == '\033') { |