mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(fontset_find_font): Fix previous change.

Browse Source
This commit is contained in:
Kenichi Handa 2009-07-09 01:06:18 +00:00
parent 49405d0e1b
commit 635c75b1af
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2009-07-09 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_find_font): Fix previous change.
2009-07-08 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)

20
src/fontset.c
View File

@ -575,25 +575,25 @@ fontset_find_font (fontset, c, face, id, fallback)
Lisp_Object font_def;
Lisp_Object font_entity, font_object;
found_index = i;
if (i == 0)
{
if (charset_matched > 0)
{
/* Try the element matching with the charset ID at first. */
found_index = charset_matched;
if (charset_matched > 0)
{
/* Make this negative so that we don't come here in the
next loop. */
charset_matched = - charset_matched;
/* We must try the first element in the next loop. */
i--;
}
}
else if (i != - charset_matched)
{
found_index = i;
}
else
else if (i == - charset_matched)
{
/* We have already tried this element and the followings
that have the same font specifications. So, skip them
all. */
that have the same font specifications in the first
iteration. So, skip them all. */
rfont_def = AREF (vec, i);
font_def = RFONT_DEF_FONT_DEF (rfont_def);
for (; i + 1 < ASIZE (vec); i++)
@ -610,7 +610,7 @@ fontset_find_font (fontset, c, face, id, fallback)
rfont_def = AREF (vec, found_index);
if (NILP (rfont_def))
{
if (charset_matched < 0)
if (i < 0)
continue;
/* This is a sign of not to try the other fonts. */
return Qt;