1 files changed, 6 insertions, 1 deletions

diff --git a/src/editfns.c b/src/editfns.c
index bf3eebb5247..495ffb4a56a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -154,7 +154,12 @@ A multibyte character is handled correctly.")
   CHECK_STRING (string, 0);
   p = XSTRING (string);
   if (p->size)
-    XSETFASTINT (val, STRING_CHAR (p->data, STRING_BYTES (p)));
+    {
+      if (STRING_MULTIBYTE (string))
+        XSETFASTINT (val, STRING_CHAR (p->data, STRING_BYTES (p)));
+      else
+        XSETFASTINT (val, p->data[0]);
+    }
   else
     XSETFASTINT (val, 0);
   return val;