--- a/FontPanel.st	Wed Mar 10 16:46:12 2004 +0100
+++ b/FontPanel.st	Wed Mar 10 17:21:32 2004 +0100
@@ -343,8 +343,11 @@
     ].
     encoding notNil ifTrue:[
         fontPanel encoding:encoding.
+    ] ifFalse:[
+        initialFont notNil ifTrue:[
+            fontPanel encoding:initialFont encoding
+        ].
     ].
-
     fontPanel showAtPointer.
     fontPanel destroy.
     ^ selectedFont
@@ -408,7 +411,6 @@
     encodingFilter contents:encoding.
     self encodingFilterSelected:encoding.
     self showSelectedFont.
-    self showPreview
 
     "Modified: 23.2.1996 / 00:51:32 / cg"
 ! !
@@ -555,7 +557,6 @@
             addAll:
                 #(
                     '*'
-                    'ANSI'
                     nil
                 ).
     ] ifFalse:[
@@ -584,7 +585,7 @@
                                     userFriendlyName := encoder userFriendlyNameOfEncoding.
                                 ].
                             ].
-                            (userFriendlyName notNil and:[userFriendlyName ~= enc]) ifTrue:[
+                            (userFriendlyName notNil and:[(userFriendlyName sameAs: enc) not]) ifTrue:[
                                 enc , ' (' , userFriendlyName , ')'
                             ] ifFalse:[
                                 enc
@@ -948,5 +949,5 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.80 2004-03-10 15:46:12 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.81 2004-03-10 16:21:32 ca Exp $'
 ! !