Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-18 12:01:11 +00:00
4 changed files with 38 additions and 9 deletions

1
tmux.h
View File

@ -2297,6 +2297,7 @@ enum utf8_state utf8_append(struct utf8_data *, u_char);
enum utf8_state utf8_combine(const struct utf8_data *, wchar_t *);
enum utf8_state utf8_split(wchar_t, struct utf8_data *);
int utf8_strvis(char *, const char *, size_t, int);
int utf8_stravis(char **, const char *, int);
char *utf8_sanitize(const char *);
size_t utf8_strlen(const struct utf8_data *);
u_int utf8_strwidth(const struct utf8_data *, ssize_t);