--- a/src/objects.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/src/objects.c	Mon Aug 13 08:46:35 2007 +0200
@@ -703,17 +703,6 @@
 
 /* No equal or hash methods; ignore the face the font is based off
    of for `equal' */
-
-int
-font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			   CONST Bufbyte *nonreloc, Lisp_Object reloc,
-			   Bytecount offset, Bytecount length)
-{
-  return DEVMETH_OR_GIVEN (d, font_spec_matches_charset,
-			   (d, charset, nonreloc, reloc, offset, length),
-			   1);
-}
-
 static Lisp_Object
 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
 		  Lisp_Object domain, Lisp_Object instantiator,
@@ -734,7 +723,8 @@
 	}
       instantiator = Ffont_instance_name (instantiator);
     }
-  else if (STRINGP (instantiator))
+  
+  if (STRINGP (instantiator))
     {
       /* First, look to see if we can retrieve a cached value. */
       instance = Fgethash (instantiator, d->font_instance_cache, Qunbound);