From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 26 Jan 2009 15:50:43 +0000 (+0000)
Subject: (fontset_find_font): Fix handling of non-cons return
X-Git-Tag: emacs-pretest-23.0.90~189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf86d09c114f54879bcc66c1f262df4adeaf63b8;p=emacs.git

(fontset_find_font): Fix handling of non-cons return
value of fontset_get_font_group.
(fontset_font): Revert last change.
---

diff --git a/src/fontset.c b/src/fontset.c
index 983f4f0d044..cd375683083 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -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))