From: Kenichi Handa <handa@m17n.org>
Date: Sat, 10 Apr 1999 02:23:06 +0000 (+0000)
Subject: (create-fontset-from-fontset-spec):
X-Git-Tag: emacs-20.4~340
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75447cdd777d0bd41dcca691b27f2c7a3b892e90;p=emacs.git

(create-fontset-from-fontset-spec):
Don't register duplicated alias fontset names.
---

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 6a3867d244c..49430477e48 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -520,10 +520,12 @@ It returns a name of the created fontset."
 	      (or (rassoc alias fontset-alias-alist)
 		  (setq fontset-alias-alist
 			(cons (cons name alias) fontset-alias-alist)))))
-	(setq fontset-alias-alist
-	      (cons (cons name resolved-ascii-font)
-		    fontset-alias-alist))
+	(or (rassoc resolved-ascii-font fontset-alias-alist)
+	    (setq fontset-alias-alist
+		  (cons (cons name resolved-ascii-font)
+			fontset-alias-alist)))
 	(or (equal ascii-font resolved-ascii-font)
+	    (rassoc ascii-font fontset-alias-alist)
 	    (setq fontset-alias-alist
 		  (cons (cons name ascii-font)
 			fontset-alias-alist)))
@@ -563,9 +565,10 @@ It returns a name of the created fontset."
 				    (cons (cons 'ascii new-ascii-font)
 					  nonascii-fontlist))
 			      uninstantiated-fontset-alist))
-		  (setq fontset-alias-alist
-			(cons (cons new-name new-ascii-font)
-			      fontset-alias-alist)))
+		  (or (rassoc new-ascii-font fontset-alias-alist)
+		      (setq fontset-alias-alist
+			    (cons (cons new-name new-ascii-font)
+				  fontset-alias-alist))))
 		(setq style-variant (cdr style-variant)))))))
     name))