From: Kenichi Handa <handa@m17n.org>
Date: Tue, 1 Sep 1998 02:24:46 +0000 (+0000)
Subject: (x-complement-fontset-spec): If ASCII
X-Git-Tag: emacs-20.4~1788
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0c8b3efad7827b7f768f4ea5bae8debcfecd036;p=emacs.git

(x-complement-fontset-spec): If ASCII
font is specified in FONTLIST, don't substitute it for the
resolved name.
---

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."
     ;; Be sure that ASCII font is available.
     (let ((slot (or (assq 'ascii fontlist) (assq 'ascii new-fontlist)))
 	  ascii-font)
-      (if (setq ascii-font (condition-case nil
-			       (x-resolve-font-name (cdr slot))
-			     (error nil)))
-	  (setcdr slot ascii-font))
+      (setq ascii-font (condition-case nil
+			   (x-resolve-font-name (cdr slot))
+			 (error nil)))
       (if ascii-font
 	  (let ((l x-font-name-charset-alist))
 	    ;; If the ASCII font can also be used for another