Mercurial > hg > xemacs-beta
changeset 4022:58cd1008908c
[xemacs-hg @ 2007-06-21 13:47:55 by aidan]
Accept numbers in MSWindows font family names.
| author | aidan |
|---|---|
| date | Thu, 21 Jun 2007 13:47:58 +0000 |
| parents | cef5f57bb9e2 |
| children | 27b5d12ddbd7 |
| files | lisp/ChangeLog lisp/msw-faces.el |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 21 13:39:36 2007 +0000 +++ b/lisp/ChangeLog Thu Jun 21 13:47:58 2007 +0000 @@ -1,3 +1,10 @@ +2007-06-21 Aidan Kehoe <kehoea@parhasard.net> + + * msw-faces.el: + Accept numbers, indeed anything other than a colon, as legitmate + in a font family as parsed by mswindows-font-regexp. Fixes the + problem reported in puftoj6l.fsf@isoware.de of six years ago. + 2007-06-21 Aidan Kehoe <kehoea@parhasard.net> * mule/devan-util.el (devanagari-reorder-glyphs-for-composition):
--- a/lisp/msw-faces.el Thu Jun 21 13:39:36 2007 +0000 +++ b/lisp/msw-faces.el Thu Jun 21 13:47:58 2007 +0000 @@ -68,7 +68,9 @@ ;; Other functions expect these regexps (let ((- ":") - (fontname "\\([a-zA-Z ]*\\)") ; 1 + ;; What happens if a font family contains a colon? I can't find any + ;; documentation on that, and don't have a font editor to hand to test. + (fontname "\\([^:]*\\)") ; 1 (style "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 2 (pointsize "\\([0-9]*\\)") ; 3 (effects "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 4