Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-server-info.c
	cmd-start-server.c
This commit is contained in:
Thomas Adam
2014-01-31 21:39:56 +00:00
35 changed files with 1414 additions and 699 deletions

View File

@ -133,7 +133,7 @@ xterm_keys_match(const char *template, const char *buf, size_t len)
do {
if (*template != '_' && buf[pos] != *template)
return (-1);
} while (pos++ != len && *++template != '\0');
} while (*++template != '\0' && ++pos != len);
if (*template != '\0') /* partial */
return (1);