From c2b53598ad0130398e923135d5c80e0884356feb Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 21 Mar 2017 14:48:44 +0000
Subject: Bad merge.

---
 utf8.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utf8.c b/utf8.c
index d94a6437..e2802936 100644
--- a/utf8.c
+++ b/utf8.c
@@ -115,7 +115,7 @@ utf8_width(wchar_t wc)
 	width = wcwidth(wc);
 #endif
 	if (width < 0 || width > 0xff) {
-		log_debug("Unicode %04x, wcwidth() %d", wc, width);
+		log_debug("Unicode %04lx, wcwidth() %d", (long)wc, width);
 
 #ifndef __OpenBSD__
 		/*
-- 
cgit