--- a/Font.st	Mon Jul 26 18:39:30 2010 +0200
+++ b/Font.st	Tue Jul 27 16:38:20 2010 +0200
@@ -609,10 +609,12 @@
         fetchedEncoding := device encodingOf:fontId.
     ].
     encoding notNil ifTrue:[
-        (encoding = fetchedEncoding) ifFalse:[
+        (encoding ~= fetchedEncoding
+         and:[encoding ~= #'ms-default'
+         and:[encoding ~= #*]]) ifTrue:[
             'Font [warning]: encoding should be ' infoPrint. encoding infoPrint.
             ' is ' infoPrint. fetchedEncoding infoPrintCR.
-        ]
+        ].
     ] ifFalse:[
         encoding := fetchedEncoding.
     ].
@@ -1231,11 +1233,11 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.122 2010-07-23 13:24:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.123 2010-07-27 14:38:20 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.122 2010-07-23 13:24:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.123 2010-07-27 14:38:20 stefan Exp $'
 ! !
 
 Font initialize!