Merge branch 'obsd-master'

2 files changed, 4 insertions, 4 deletions

diff --git a/input.c b/input.c
index f7b4e460..6e1fec90 100644
--- a/input.c
+++ b/input.c
@@ -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);
diff --git a/utf8.c b/utf8.c
index 84322a9b..2a152d48 100644
--- a/utf8.c
+++ b/utf8.c
@@ -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 },