Mercurial > emacs
comparison lisp/international/fontset.el @ 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 | ab814ec4995e |
| children | 987e55950346 |
comparison
equal
deleted
inserted
replaced
| 24608:a16dadaa425d | 24609:38dc0ce2bf99 |
|---|---|
| 518 (not (assoc name fontset-alias-alist))) | 518 (not (assoc name fontset-alias-alist))) |
| 519 (let ((alias (match-string 0 name))) | 519 (let ((alias (match-string 0 name))) |
| 520 (or (rassoc alias fontset-alias-alist) | 520 (or (rassoc alias fontset-alias-alist) |
| 521 (setq fontset-alias-alist | 521 (setq fontset-alias-alist |
| 522 (cons (cons name alias) fontset-alias-alist))))) | 522 (cons (cons name alias) fontset-alias-alist))))) |
| 523 (setq fontset-alias-alist | 523 (or (rassoc resolved-ascii-font fontset-alias-alist) |
| 524 (cons (cons name resolved-ascii-font) | 524 (setq fontset-alias-alist |
| 525 fontset-alias-alist)) | 525 (cons (cons name resolved-ascii-font) |
| 526 fontset-alias-alist))) | |
| 526 (or (equal ascii-font resolved-ascii-font) | 527 (or (equal ascii-font resolved-ascii-font) |
| 528 (rassoc ascii-font fontset-alias-alist) | |
| 527 (setq fontset-alias-alist | 529 (setq fontset-alias-alist |
| 528 (cons (cons name ascii-font) | 530 (cons (cons name ascii-font) |
| 529 fontset-alias-alist))) | 531 fontset-alias-alist))) |
| 530 | 532 |
| 531 ;; At last, handle style variants. | 533 ;; At last, handle style variants. |
| 561 (cons (list new-name | 563 (cons (list new-name |
| 562 style | 564 style |
| 563 (cons (cons 'ascii new-ascii-font) | 565 (cons (cons 'ascii new-ascii-font) |
| 564 nonascii-fontlist)) | 566 nonascii-fontlist)) |
| 565 uninstantiated-fontset-alist)) | 567 uninstantiated-fontset-alist)) |
| 566 (setq fontset-alias-alist | 568 (or (rassoc new-ascii-font fontset-alias-alist) |
| 567 (cons (cons new-name new-ascii-font) | 569 (setq fontset-alias-alist |
| 568 fontset-alias-alist))) | 570 (cons (cons new-name new-ascii-font) |
| 571 fontset-alias-alist)))) | |
| 569 (setq style-variant (cdr style-variant))))))) | 572 (setq style-variant (cdr style-variant))))))) |
| 570 name)) | 573 name)) |
| 571 | 574 |
| 572 (defun create-fontset-from-ascii-font (font &optional resolved-font | 575 (defun create-fontset-from-ascii-font (font &optional resolved-font |
| 573 fontset-name) | 576 fontset-name) |