[Emacs-diffs] emacs/src fontset.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/01/26 15:50:44

Modified files:
        src            : fontset.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.151&r2=1.152

Patches:
Index: fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- fontset.c   24 Jan 2009 22:42:02 -0000      1.151
+++ fontset.c   26 Jan 2009 15:50:43 -0000      1.152
@@ -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))