# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1232985043 0
# Node ID 561d416172d019ba5c3935f64202b66d690400e2
# Parent  a8bcd83f40c56a1f297f74734f11ffd8f62cd8df
(fontset_find_font): Fix handling of non-cons return
value of fontset_get_font_group.
(fontset_font): Revert last change.

diff -r a8bcd83f40c5 -r 561d416172d0 src/fontset.c
--- a/src/fontset.c	Mon Jan 26 15:50:18 2009 +0000
+++ b/src/fontset.c	Mon Jan 26 15:50:43 2009 +0000
@@ -521,7 +521,7 @@
 
   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 @@
   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))