diff options
| author | Kenichi Handa | 2006-11-29 12:18:53 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-11-29 12:18:53 +0000 |
| commit | 575abfb7c8a5d7f7f7522fe2de5158aeecee340e (patch) | |
| tree | 731a20152870b6999dd531e1607a146bdfa1bc0a /src/xfont.c | |
| parent | 09a56ce40943169cb68eae4d593427af48a23cc8 (diff) | |
| download | emacs-575abfb7c8a5d7f7f7522fe2de5158aeecee340e.tar.gz emacs-575abfb7c8a5d7f7f7522fe2de5158aeecee340e.zip | |
(xfont_driver): Initialize ftfont_driver.type by 0.
(xfont_list): Don't directly use Lisp_Object as an operand of &&.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 6 |
1 files 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)); | |||
| 255 | 255 | ||
| 256 | struct font_driver xfont_driver = | 256 | struct font_driver xfont_driver = |
| 257 | { | 257 | { |
| 258 | (Lisp_Object) NULL, /* Qx */ | 258 | 0, /* Qx */ |
| 259 | xfont_get_cache, | 259 | xfont_get_cache, |
| 260 | xfont_list, | 260 | xfont_list, |
| 261 | xfont_match, | 261 | xfont_match, |
| @@ -413,8 +413,8 @@ xfont_list (frame, spec) | |||
| 413 | 413 | ||
| 414 | if (! NILP (registry) | 414 | if (! NILP (registry) |
| 415 | && (alter = Fassoc (SYMBOL_NAME (registry), | 415 | && (alter = Fassoc (SYMBOL_NAME (registry), |
| 416 | Vface_alternative_font_registry_alist)) | 416 | Vface_alternative_font_registry_alist), |
| 417 | && CONSP (alter)) | 417 | CONSP (alter))) |
| 418 | { | 418 | { |
| 419 | /* Pointer to REGISTRY-ENCODING field. */ | 419 | /* Pointer to REGISTRY-ENCODING field. */ |
| 420 | char *r = name + len - SBYTES (SYMBOL_NAME (registry)); | 420 | char *r = name + len - SBYTES (SYMBOL_NAME (registry)); |