Mercurial > emacs

comparison lisp/international/fontset.el @ 69294:5e2f7c7f5f4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(create-fontset-from-fontset-spec): Fix regexp for paring FONTSET-SPEC (allow spaces after `:').
author Kenichi Handa <handa@m17n.org>
date Mon, 06 Mar 2006 02:21:43 +0000
parents 17f02a9e1c99
children d4044fb56644
comparison
equal deleted inserted replaced
69293:409217fd29ea 69294:5e2f7c7f5f4b
540 (setq xlfd-fields (x-decompose-font-name name)) 540 (setq xlfd-fields (x-decompose-font-name name))
541 (or xlfd-fields 541 (or xlfd-fields
542 (error "Fontset \"%s\" not conforming to XLFD" name)) 542 (error "Fontset \"%s\" not conforming to XLFD" name))
543 543
544 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC. 544 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC.
545 (while (string-match "[, \t\n]*\\([^:]+\\):\\([^,]+\\)" fontset-spec idx) 545 (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)"
546 fontset-spec idx)
546 (setq idx (match-end 0)) 547 (setq idx (match-end 0))
547 (setq charset (intern (match-string 1 fontset-spec))) 548 (setq charset (intern (match-string 1 fontset-spec)))
548 (if (charsetp charset) 549 (if (charsetp charset)
549 (setq fontlist (cons (cons charset (match-string 2 fontset-spec)) 550 (setq fontlist (cons (cons charset (match-string 2 fontset-spec))
550 fontlist)))) 551 fontlist))))