--- a/Method.st	Fri Mar 12 13:44:47 2004 +0100
+++ b/Method.st	Fri Mar 12 13:46:16 2004 +0100
@@ -1884,19 +1884,18 @@
 sourceStream
     "return an open sourceStream (needs positioning)"
 
-    |stream encoding rawStream|
+    |stream encoding encoder rawStream|
 
     rawStream := stream := self rawSourceStream.
     stream notNil ifTrue:[
         "/ see if its utf8 encoded...
         encoding := SourceCodeManagerUtilities guessEncodingOfStream:stream.
-        (encoding notNil and:[encoding ~~ #'iso8859-1' and:[encoding ~~ #'ascii']]) ifTrue:[
-            stream := EncodedStream stream:stream encoder:(CharacterEncoder encoderFor:encoding).
+        encoder := CharacterEncoder encoderFor:encoding ifAbsent:nil.
+        (encoder notNil and:[encoder isNullEncoder not]) ifTrue:[
+            stream := EncodedStream stream:stream encoder:encoder.
         ].
-        "stream isExternalStream" true ifTrue:[
-            LastSourceFileName := source.
-            LastFileReference at:1 put:rawStream.
-        ].
+        LastSourceFileName := source.
+        LastFileReference at:1 put:rawStream.
     ].
     ^ stream
 ! !
@@ -2900,7 +2899,7 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.268 2004-03-12 09:14:46 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.269 2004-03-12 12:46:16 cg Exp $'
 ! !
 
 Method initialize!