Merge from emacs--devo--0

[gnu-emacs] / src / xfont.c

diff --git a/src/xfont.c b/src/xfont.c
index 9941fb2655a32b2d09b76915d432df044f52b963..59cc31d78e4aeba5f86064426a77c4ed59d91b60 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -255,7 +255,7 @@ static int xfont_draw P_ ((struct glyph_string *, int, int, int, int, int));
 
 struct font_driver xfont_driver =
   {
-    (Lisp_Object) NULL,                /* Qx */
+    0,                         /* Qx */
     xfont_get_cache,
     xfont_list,
     xfont_match,
@@ -413,8 +413,8 @@ xfont_list (frame, spec)
 
          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));
@@ -592,6 +592,7 @@ xfont_open (f, entity, pixel_size)
   if (! xfont)
     return NULL;
   font = malloc (sizeof (struct font));
+  font->format = Qx;
   font->font.font = xfont;
   font->entity = entity;
   font->pixel_size = pixel_size;