aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKenichi Handa2006-03-06 02:16:23 +0000
committerKenichi Handa2006-03-06 02:16:23 +0000
commit31f5d05a01218be6e1c7f9bd87296ac99c4aa97d (patch)
treeb2ca082c5e1a9bd13ece6f51cac8e5a6a5c613d4 /lisp
parenta3efdc85d8290a5ef10d164ea907f3a0adaef9b5 (diff)
downloademacs-31f5d05a01218be6e1c7f9bd87296ac99c4aa97d.tar.gz
emacs-31f5d05a01218be6e1c7f9bd87296ac99c4aa97d.zip
(create-fontset-from-fontset-spec): Fix
regexp for paring FONTSET-SPEC (allow spaces after `:').
Diffstat (limited to 'lisp')
-rw-r--r--lisp/international/fontset.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 4bad7244161..eb5bbd98c60 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -676,7 +676,8 @@ which case, the corresponding script is decided by the variable
676 (error "Fontset name \"%s\" not conforming to XLFD" name)) 676 (error "Fontset name \"%s\" not conforming to XLFD" name))
677 677
678 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC. 678 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC.
679 (while (string-match "[, \t\n]*\\([^:]+\\):\\([^,]+\\)" fontset-spec idx) 679 (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)"
680 fontset-spec idx)
680 (setq idx (match-end 0)) 681 (setq idx (match-end 0))
681 (setq target (intern (match-string 1 fontset-spec))) 682 (setq target (intern (match-string 1 fontset-spec)))
682 (cond ((or (eq target 'ascii) 683 (cond ((or (eq target 'ascii)
@@ -746,6 +747,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
746 fontset-spec) 747 fontset-spec)
747 (while (setq fontset-spec (x-get-resource (format "fontset-%d" idx) 748 (while (setq fontset-spec (x-get-resource (format "fontset-%d" idx)
748 (format "Fontset-%d" idx))) 749 (format "Fontset-%d" idx)))
750 (message "%s" fontset-spec)
749 (create-fontset-from-fontset-spec fontset-spec t 'noerror) 751 (create-fontset-from-fontset-spec fontset-spec t 'noerror)
750 (setq idx (1+ idx))))) 752 (setq idx (1+ idx)))))
751 753