changeset 100173:d704965776e6

(font_at): Set `multibyte' at first.
author Kenichi Handa <handa@m17n.org>
date Wed, 03 Dec 2008 05:54:15 +0000
parents 224084bcdb3a
children 8c996aad13cc
files src/font.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/font.c	Wed Dec 03 05:48:37 2008 +0000
+++ b/src/font.c	Wed Dec 03 05:54:15 2008 +0000
@@ -3622,11 +3622,13 @@
   int multibyte;
   Lisp_Object font_object;
 
+  multibyte = (NILP (string)
+	       ? ! NILP (current_buffer->enable_multibyte_characters)
+	       : STRING_MULTIBYTE (string));
   if (c < 0)
     {
       if (NILP (string))
 	{
-	  multibyte = ! NILP (current_buffer->enable_multibyte_characters);
 	  if (multibyte)
 	    {
 	      EMACS_INT pos_byte = CHAR_TO_BYTE (pos);