(font_at): Set `multibyte' at first.

diff --git a/src/ChangeLog b/src/ChangeLog
index c71996f46134fc0f56861268c5e2535b66dec89a..48448c3b95c31fc43798205de560c6c32d6c940b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-12-03  Kenichi Handa  <handa@m17n.org>
 
+       * font.c (font_at): Set `multibyte' at first.
+
        * coding.c (decode_coding_charset): Check type of an element of
        vector VALIDS.
 

diff --git a/src/font.c b/src/font.c
index 41dc9e61626e062c830e4b7199dc5bf586fbe98e..0267ade1c4be0f968e673b780b78f181a8e536c5 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3622,11 +3622,13 @@ font_at (c, pos, face, w, string)
   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);