Mercurial > emacs
changeset 90698:a31984e21969
(xfont_driver): Initialize ftfont_driver.type by 0.
(xfont_list): Don't directly use Lisp_Object as an operand of &&.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 29 Nov 2006 12:18:53 +0000 |
| parents | 444b40002533 |
| children | 0f20b06ffb3a |
| files | src/xfont.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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));