mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

(fontset_find_font): Fix handling of non-cons return

Browse Source 
value of fontset_get_font_group.
(fontset_font): Revert last change.
This commit is contained in:
Chong Yidong 2009-01-26 15:50:43 +00:00
parent 5be8fcc0d2
commit bf86d09c11
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fontset.c
View File

@ -521,7 +521,7 @@ fontset_find_font (fontset, c, face, id, fallback)
font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
if (! CONSP (font_group))
return Qnil;
return font_group;
vec = XCDR (font_group);
if (ASIZE (vec) == 0)
return Qnil;
@ -660,10 +660,6 @@ fontset_font (fontset, c, face, id)
Lisp_Object rfont_def;
Lisp_Object base_fontset;
/* If we know there is no font of C, don't do any work. */
if (EQ (fontset_ref (fontset, c), Qt))
return Qnil;
/* Try a font-group of FONTSET. */
rfont_def = fontset_find_font (fontset, c, face, id, 0);
if (VECTORP (rfont_def))