changeset 24609:38dc0ce2bf99

(create-fontset-from-fontset-spec): Don't register duplicated alias fontset names.
author Kenichi Handa <handa@m17n.org>
date Sat, 10 Apr 1999 02:23:06 +0000
parents a16dadaa425d
children 66a14155ad78
files lisp/international/fontset.el
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/fontset.el	Sat Apr 10 02:21:00 1999 +0000
+++ b/lisp/international/fontset.el	Sat Apr 10 02:23:06 1999 +0000
@@ -520,10 +520,12 @@
 	      (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 @@
 				    (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))