mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 22:40:51 -08:00
Code Issues Projects Releases Wiki Activity

(reorder_font_vector): Use encoding charset of fonts

Browse source 
for sorting.
(face_for_char): Use deferred log.
This commit is contained in:
Kenichi Handa 2008-08-19 07:45:55 +00:00
parent 3cf38f9777
commit cd872f08bf
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/fontset.c
View file

@ -419,16 +419,16 @@ reorder_font_vector (font_group, font)
if (! font_match_p (font_spec, font_object))
{
Lisp_Object repertory = FONT_DEF_REPERTORY (font_def);
Lisp_Object encoding = FONT_DEF_ENCODING (font_def);
if (! NILP (repertory))
if (! NILP (encoding))
{
Lisp_Object tail;
for (tail = Vcharset_ordered_list;
! EQ (tail, Vcharset_non_preferred_head) && CONSP (tail);
score += 0x100, tail = XCDR (tail))
if (EQ (repertory, XCAR (tail)))
if (EQ (encoding, XCAR (tail)))
break;
}
else
@ -904,7 +904,7 @@ face_for_char (f, face, c, pos, object)
}
}
font_add_log ("finding a font for", Fcons (make_number (c), charset), Qnil);
font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);
rfont_def = fontset_font (fontset, c, face, id);
if (VECTORP (rfont_def))
{