diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c71996f4613..48448c3b95c 100644 --- 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 41dc9e61626..0267ade1c4b 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); |