mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-01 09:51:22 -08:00
(xfont_driver): Initialize ftfont_driver.type by 0.
(xfont_list): Don't directly use Lisp_Object as an operand of &&.
This commit is contained in:
parent
09a56ce409
commit
575abfb7c8
1 changed files with 3 additions and 3 deletions
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue