circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-11-14 14:01:08 +00:00
parent f12d7f0d4b 14d90e4901
commit bb820fa761
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input.c
View File

@ -1924,7 +1924,7 @@ input_utf8_open(struct input_ctx *ictx)
struct utf8_data *ud = &ictx->utf8data;
if (utf8_open(ud, ictx->ch) != UTF8_MORE)
log_fatalx("UTF-8 open invalid %#hhx", ictx->ch);
log_fatalx("UTF-8 open invalid %#x", ictx->ch);
log_debug("%s %hhu", __func__, ud->size);
@ -1938,7 +1938,7 @@ input_utf8_add(struct input_ctx *ictx)
struct utf8_data *ud = &ictx->utf8data;
if (utf8_append(ud, ictx->ch) != UTF8_MORE)
log_fatalx("UTF-8 add invalid %#hhx", ictx->ch);
log_fatalx("UTF-8 add invalid %#x", ictx->ch);
log_debug("%s", __func__);
@ -1952,7 +1952,7 @@ input_utf8_close(struct input_ctx *ictx)
struct utf8_data *ud = &ictx->utf8data;
if (utf8_append(ud, ictx->ch) != UTF8_DONE)
log_fatalx("UTF-8 close invalid %#hhx", ictx->ch);
log_fatalx("UTF-8 close invalid %#x", ictx->ch);
log_debug("%s %hhu '%*s' (width %hhu)", __func__, ud->size,
(int)ud->size, ud->data, ud->width);

2
utf8.c
View File

@ -263,7 +263,7 @@ static struct utf8_width_entry utf8_width_table[] = {
{ 0x0abe5, 0x0abe5, 0, NULL, NULL },
{ 0x0abed, 0x0abed, 0, NULL, NULL },
{ 0x0f900, 0x0fa6d, 2, NULL, NULL },
{ 0x0d800, 0x0f8ff, 0, NULL, NULL },
{ 0x0d800, 0x0dfff, 0, NULL, NULL },
{ 0x0fa70, 0x0fad9, 2, NULL, NULL },
{ 0x0fff9, 0x0fffb, 0, NULL, NULL },
{ 0x0fe30, 0x0fe52, 2, NULL, NULL },