# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1164802733 0
# Node ID a31984e21969a88abaaf223f3c4308a42e64983b
# Parent  444b40002533a51b136d1de5f8c7a0aa88788350
(xfont_driver): Initialize ftfont_driver.type by 0.
(xfont_list): Don't directly use Lisp_Object as an operand of &&.

diff -r 444b40002533 -r a31984e21969 src/xfont.c
--- a/src/xfont.c	Wed Nov 29 12:17:27 2006 +0000
+++ b/src/xfont.c	Wed Nov 29 12:18:53 2006 +0000
@@ -255,7 +255,7 @@
 
 struct font_driver xfont_driver =
   {
-    (Lisp_Object) NULL,		/* Qx */
+    0,				/* Qx */
     xfont_get_cache,
     xfont_list,
     xfont_match,
@@ -413,8 +413,8 @@
 
 	  if (! NILP (registry)
 	      && (alter = Fassoc (SYMBOL_NAME (registry),
-				  Vface_alternative_font_registry_alist))
-	      && CONSP (alter))
+				  Vface_alternative_font_registry_alist),
+		  CONSP (alter)))
 	    {
 	      /* Pointer to REGISTRY-ENCODING field.  */
 	      char *r = name + len - SBYTES (SYMBOL_NAME (registry));