(font_at): Set `multibyte' at first.

e500c47d · Kenichi Handa · ca516334 · e500c47d · e500c47d
Commit e500c47d authored Dec 03, 2008 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/font.c src/font.c +3 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.


--- 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);