Merge branch 'obsd-master'

Conflicts:
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2014-02-16 23:02:07 +00:00
14 changed files with 90 additions and 67 deletions

View File

@ -131,7 +131,9 @@ xterm_keys_match(const char *template, const char *buf, size_t len)
pos = 0;
do {
if (*template != '_' && buf[pos] != *template)
if (*template == '_' && buf[pos] >= '1' && buf[pos] <= '8')
continue;
if (buf[pos] != *template)
return (-1);
} while (*++template != '\0' && ++pos != len);