(create-fontset-from-fontset-spec):

Don't register duplicated alias fontset names.

1 files changed, 9 insertions, 6 deletions

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))