diff options
| author | Kenichi Handa | 2003-10-02 02:06:08 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-10-02 02:06:08 +0000 |
| commit | de5c0f39590946d6e4cfbf25040920ea5579a60b (patch) | |
| tree | 47f56090ede5004dab19a74b0112b34853773418 | |
| parent | e559b126837a19a4fe5d0009adaa56f3257d28bc (diff) | |
| download | emacs-de5c0f39590946d6e4cfbf25040920ea5579a60b.tar.gz emacs-de5c0f39590946d6e4cfbf25040920ea5579a60b.zip | |
(fs_load_font): Don't set fontp->font_encoder to NULL
before calling find_ccl_program_func. Call find_ccl_program_func
only when fontp->font_encoder is not NULL.
| -rw-r--r-- | src/fontset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/fontset.c b/src/fontset.c index 996631f1a59..990c1bbb9fa 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -690,9 +690,7 @@ fs_load_font (f, c, fontname, id, face) | |||
| 690 | } | 690 | } |
| 691 | } | 691 | } |
| 692 | 692 | ||
| 693 | fontp->font_encoder = (struct ccl_program *) 0; | 693 | if (! fontp->font_encoder && find_ccl_program_func) |
| 694 | |||
| 695 | if (find_ccl_program_func) | ||
| 696 | (*find_ccl_program_func) (fontp); | 694 | (*find_ccl_program_func) (fontp); |
| 697 | 695 | ||
| 698 | /* If we loaded a font for a face that has fontset, record the face | 696 | /* If we loaded a font for a face that has fontset, record the face |