From 356a00319493e1f764b2f30c868ee341a2ad12a5 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Sun, 8 Feb 2015 14:47:56 +0800
Subject: [PATCH] buffer-position reports character under cursor according to
 type (either 0xXX or \uXXXX).

---
 random.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/random.c b/random.c
index 71fe0a7..7aa2e9a 100644
--- a/random.c
+++ b/random.c
@@ -74,6 +74,7 @@ int showcpos(int f, int n)
 	long predchars;	/* # chars preceding point */
 	int predlines;	/* # lines preceding point */
 	unicode_t curchar ;	/* character under cursor */
+	unsigned bytes ;	/* length of unicode sequence */
 	int ratio;
 	int col;
 	int savepos;		/* temp save for current offset */
@@ -88,6 +89,7 @@ int showcpos(int f, int n)
 	predchars = 0;
 	predlines = 0;
 	curchar = 0;
+	bytes = 1 ;
 	while (lp != curbp->b_linep) {
 		/* if we are on the current line, record it */
 		if (lp == curwp->w_dotp) {
@@ -99,7 +101,7 @@ int showcpos(int f, int n)
 			if( (curwp->w_doto) == len)
 				curchar = '\n';
 			else
-				(void) utf8_to_unicode( lp->l_text, curwp->w_doto, len, &curchar) ;
+				bytes = utf8_to_unicode( lp->l_text, curwp->w_doto, len, &curchar) ;
 		}
 		/* on to the next line */
 		++numlines;
@@ -128,9 +130,9 @@ int showcpos(int f, int n)
 		ratio = (100L * predchars) / numchars;
 
 	/* summarize and report the info */
-	mlwrite("Line %d/%d Col %d/%d Char %D/%D (%d%%) char = 0x%x",
+	mlwrite("Line %d/%d Col %d/%d Char %D/%D (%d%%) char = %s%x",
 		predlines + 1, numlines + 1, col, ecol,
-		predchars, numchars, ratio, curchar);
+		predchars, numchars, ratio, (bytes > 1) ? "\\u" : "0x", curchar);
 	return TRUE;
 }