diff options
| author | Kenichi Handa | 1998-09-01 02:24:46 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1998-09-01 02:24:46 +0000 |
| commit | f0c8b3efad7827b7f768f4ea5bae8debcfecd036 (patch) | |
| tree | a3870ce992db4989aade348f9c90df99707f9868 | |
| parent | 490822ffc807a37b5ccc51f367b09edf101a8ee6 (diff) | |
| download | emacs-f0c8b3efad7827b7f768f4ea5bae8debcfecd036.tar.gz emacs-f0c8b3efad7827b7f768f4ea5bae8debcfecd036.zip | |
(x-complement-fontset-spec): If ASCII
font is specified in FONTLIST, don't substitute it for the
resolved name.
| -rw-r--r-- | lisp/international/fontset.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index a3056afc01e..06c5ada9d25 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -320,10 +320,9 @@ automatically." | |||
| 320 | ;; Be sure that ASCII font is available. | 320 | ;; Be sure that ASCII font is available. |
| 321 | (let ((slot (or (assq 'ascii fontlist) (assq 'ascii new-fontlist))) | 321 | (let ((slot (or (assq 'ascii fontlist) (assq 'ascii new-fontlist))) |
| 322 | ascii-font) | 322 | ascii-font) |
| 323 | (if (setq ascii-font (condition-case nil | 323 | (setq ascii-font (condition-case nil |
| 324 | (x-resolve-font-name (cdr slot)) | 324 | (x-resolve-font-name (cdr slot)) |
| 325 | (error nil))) | 325 | (error nil))) |
| 326 | (setcdr slot ascii-font)) | ||
| 327 | (if ascii-font | 326 | (if ascii-font |
| 328 | (let ((l x-font-name-charset-alist)) | 327 | (let ((l x-font-name-charset-alist)) |
| 329 | ;; If the ASCII font can also be used for another | 328 | ;; If the ASCII font can also be used for another |