(xfont_list): Don't directly use Lisp_Object as an operand of &&.
struct font_driver xfont_driver =
{
- (Lisp_Object) NULL, /* Qx */
+ 0, /* Qx */
xfont_get_cache,
xfont_list,
xfont_match,
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));