diff options
| author | Kenichi Handa | 2006-03-06 02:22:35 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-03-06 02:22:35 +0000 |
| commit | 50e3e56454a5ea2dc65bc41d5c4eaa4b6f942dfd (patch) | |
| tree | b1878e847384fb7ad0f6d5688fc6764d674d452c | |
| parent | bfc50337514e1ed0fa23a1a3bde7e1e1dc1b5bab (diff) | |
| download | emacs-50e3e56454a5ea2dc65bc41d5c4eaa4b6f942dfd.tar.gz emacs-50e3e56454a5ea2dc65bc41d5c4eaa4b6f942dfd.zip | |
(create-fontset-from-fontset-spec): Fix
regexp for paring FONTSET-SPEC (allow spaces after `:').
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/fontset.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ff7cfe2883..73ea842b8e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-03-06 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/fontset.el (create-fontset-from-fontset-spec): Fix | ||
| 4 | regexp for paring FONTSET-SPEC (allow spaces after `:'). | ||
| 5 | |||
| 1 | 2006-03-05 Luc Teirlinck <teirllm@auburn.edu> | 6 | 2006-03-05 Luc Teirlinck <teirllm@auburn.edu> |
| 2 | 7 | ||
| 3 | * progmodes/gud.el (gud-jdb-marker-filter): Double quote `[' in | 8 | * progmodes/gud.el (gud-jdb-marker-filter): Double quote `[' in |
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 1e5c9508f4e..e42ab3e5ee9 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -542,7 +542,8 @@ It returns a name of the created fontset." | |||
| 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) |