# HG changeset patch
# User aidan
# Date 1182433678 0
# Node ID 58cd1008908cf87ae6ada2bc973ce49fa1b926b9
# Parent  cef5f57bb9e2a37aa449af7830ecf5ffd394028d
[xemacs-hg @ 2007-06-21 13:47:55 by aidan]
Accept numbers in MSWindows font family names.

diff -r cef5f57bb9e2 -r 58cd1008908c lisp/ChangeLog
--- 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):
diff -r cef5f57bb9e2 -r 58cd1008908c lisp/msw-faces.el
--- 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