--- a/CharacterArray.st	Wed Feb 18 18:39:31 2004 +0100
+++ b/CharacterArray.st	Wed Feb 18 18:53:23 2004 +0100
@@ -3945,6 +3945,7 @@
     |newString table|
 
     encodingSymbol isNil ifTrue:[^ self].
+    encodingSymbol = #'iso10646-1' ifTrue:[^ self].
 
     "/ notice: this method may not be moved to
     "/ concrete TwoByte classes; it is also invoked
@@ -3989,7 +3990,7 @@
 !
 
 encodeFrom:oldEncoding into:newEncoding
-    ^ CharacterEncoder encode:self from:oldEncoding into:newEncoding
+    ^ CharacterEncoder encodeString:self from:oldEncoding into:newEncoding
 !
 
 encodeInto:encodingSymbol
@@ -6212,7 +6213,7 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.279 2004-02-17 12:08:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.280 2004-02-18 17:53:23 cg Exp $'
 ! !
 
 CharacterArray initialize!