--- a/CharacterArray.st	Fri Apr 30 18:51:56 2010 +0200
+++ b/CharacterArray.st	Mon May 03 15:20:52 2010 +0200
@@ -1881,10 +1881,10 @@
     |s|
 
     (s := self string) ~~ self ifTrue:[
-	^ s endsWith:aStringOrCharacter
+        ^ s endsWith:aStringOrCharacter
     ].
-    aStringOrCharacter isCharacter ifTrue:[
-	^ self last = aStringOrCharacter
+    (self notEmpty and:[aStringOrCharacter isCharacter]) ifTrue:[
+        ^ self last = aStringOrCharacter
     ].
     ^ super endsWith:aStringOrCharacter
 
@@ -5769,11 +5769,11 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.431 2010-03-08 07:42:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.432 2010-05-03 13:20:52 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.431 2010-03-08 07:42:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.432 2010-05-03 13:20:52 cg Exp $'
 ! !
 
 CharacterArray initialize!