--- a/FBrowser.st	Sat Jun 28 22:44:52 1997 +0200
+++ b/FBrowser.st	Mon Jun 30 16:44:09 1997 +0200
@@ -398,12 +398,12 @@
     dialog accepted ifTrue:[
         idx := list selectionIndex.
         fileEncoding := encodings at:idx.
-	subView externalEncoding:fileEncoding.
+        subView externalEncoding:fileEncoding.
 
         self validateFontEncodingFor:fileEncoding ask:true.
     ].
 
-    "Modified: 31.10.1996 / 16:47:47 / cg"
+    "Modified: 30.6.1997 / 14:41:12 / cg"
 !
 
 fileExecute
@@ -2286,8 +2286,10 @@
         s peek == $: ifTrue:[
             s next.
             s skipSeparators. 
-        ] ifFalse:[
-            s peek == $# ifTrue:[s next].
+        ].
+
+        s peek == $# ifTrue:[
+            s next
         ].
         w := s upToSeparator.
         w notNil ifTrue:[
@@ -2318,7 +2320,7 @@
     ^ #ascii
 
     "Created: 26.2.1996 / 17:43:08 / cg"
-    "Modified: 28.6.1997 / 20:56:55 / cg"
+    "Modified: 30.6.1997 / 16:41:11 / cg"
 !
 
 preferredFontEncodingFor:fileEncoding
@@ -2471,18 +2473,20 @@
 
         (ask not or:[self confirm:(resources string:msg) withCRs])
         ifTrue:[
-            f := FontPanel 
-                fontFromUserInitial:defaultFont
-                              title:(resources string:'font selection')
-                             filter:filter.
-            f notNil ifTrue:[
-                subView font:f
+            self withWaitCursorDo:[
+                f := FontPanel 
+                    fontFromUserInitial:defaultFont
+                                  title:(resources string:'font selection')
+                                 filter:filter.
+                f notNil ifTrue:[
+                    subView font:f
+                ]
             ]
         ]
     ]
 
     "Created: 26.10.1996 / 12:06:54 / cg"
-    "Modified: 28.6.1997 / 20:52:10 / cg"
+    "Modified: 30.6.1997 / 15:27:07 / cg"
 ! !
 
 !FileBrowser methodsFor:'private - file stuff'!
@@ -3615,5 +3619,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.167 1997-06-28 20:44:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.168 1997-06-30 14:44:09 cg Exp $'
 ! !

--- a/FileBrowser.st	Sat Jun 28 22:44:52 1997 +0200
+++ b/FileBrowser.st	Mon Jun 30 16:44:09 1997 +0200
@@ -398,12 +398,12 @@
     dialog accepted ifTrue:[
         idx := list selectionIndex.
         fileEncoding := encodings at:idx.
-	subView externalEncoding:fileEncoding.
+        subView externalEncoding:fileEncoding.
 
         self validateFontEncodingFor:fileEncoding ask:true.
     ].
 
-    "Modified: 31.10.1996 / 16:47:47 / cg"
+    "Modified: 30.6.1997 / 14:41:12 / cg"
 !
 
 fileExecute
@@ -2286,8 +2286,10 @@
         s peek == $: ifTrue:[
             s next.
             s skipSeparators. 
-        ] ifFalse:[
-            s peek == $# ifTrue:[s next].
+        ].
+
+        s peek == $# ifTrue:[
+            s next
         ].
         w := s upToSeparator.
         w notNil ifTrue:[
@@ -2318,7 +2320,7 @@
     ^ #ascii
 
     "Created: 26.2.1996 / 17:43:08 / cg"
-    "Modified: 28.6.1997 / 20:56:55 / cg"
+    "Modified: 30.6.1997 / 16:41:11 / cg"
 !
 
 preferredFontEncodingFor:fileEncoding
@@ -2471,18 +2473,20 @@
 
         (ask not or:[self confirm:(resources string:msg) withCRs])
         ifTrue:[
-            f := FontPanel 
-                fontFromUserInitial:defaultFont
-                              title:(resources string:'font selection')
-                             filter:filter.
-            f notNil ifTrue:[
-                subView font:f
+            self withWaitCursorDo:[
+                f := FontPanel 
+                    fontFromUserInitial:defaultFont
+                                  title:(resources string:'font selection')
+                                 filter:filter.
+                f notNil ifTrue:[
+                    subView font:f
+                ]
             ]
         ]
     ]
 
     "Created: 26.10.1996 / 12:06:54 / cg"
-    "Modified: 28.6.1997 / 20:52:10 / cg"
+    "Modified: 30.6.1997 / 15:27:07 / cg"
 ! !
 
 !FileBrowser methodsFor:'private - file stuff'!
@@ -3615,5 +3619,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.167 1997-06-28 20:44:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.168 1997-06-30 14:44:09 cg Exp $'
 ! !