From e500c47d647f817257023a712cdc5e6f7bcdf0cb Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 3 Dec 2008 05:54:27 +0000 Subject: [PATCH] (font_at): Set `multibyte' at first. --- src/ChangeLog | 2 ++ src/font.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c71996f461..48448c3b95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2008-12-03 Kenichi Handa + * 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 41dc9e6162..0267ade1c4 100644 --- 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); -- 2.20.1