From 575abfb7c8a5d7f7f7522fe2de5158aeecee340e Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 29 Nov 2006 12:18:53 +0000 Subject: [PATCH] (xfont_driver): Initialize ftfont_driver.type by 0. (xfont_list): Don't directly use Lisp_Object as an operand of &&. --- src/xfont.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xfont.c b/src/xfont.c index 0ea677cdeec..59cc31d78e4 100644 --- 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)); -- 2.39.5