# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1228283655 0
# Node ID d704965776e6907535a6379a46fc0eb8e7c62d41
# Parent  224084bcdb3a6b64aff5cea6f6f84ddea1e530f9
(font_at): Set `multibyte' at first.

diff -r 224084bcdb3a -r d704965776e6 src/font.c
--- 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);