--- a/CharacterArray.st	Wed Aug 25 17:23:21 2010 +0200
+++ b/CharacterArray.st	Tue Aug 31 11:23:49 2010 +0200
@@ -1506,7 +1506,6 @@
 ! !
 
 
-
 !CharacterArray methodsFor:'character searching'!
 
 includesMatchCharacters
@@ -4641,7 +4640,6 @@
     "Modified: 17.4.1997 / 12:50:23 / cg"
 ! !
 
-
 !CharacterArray methodsFor:'special string converting'!
 
 expandPlaceholdersWith:argArrayOrDictionary
@@ -4736,7 +4734,7 @@
                     aStream nextPut:(Character perform:key).
                 ].
             ] ifFalse:[
-                (next between:$1 and:$9) ifTrue:[
+                next isDigit ifTrue:[
                     v := argArrayOrDictionary at:(next digitValue) ifAbsent:nil
                 ] ifFalse:[
                     next == $( ifTrue:[
@@ -4761,7 +4759,7 @@
                             ].
                         ].
                     ] ifFalse:[
-                        next isLetterOrDigit ifTrue:[
+                        (next isLetter and:[argArrayOrDictionary isSequenceable not "is a Dictionary"]) ifTrue:[
                             "so next is a non-numeric single character."
                             v := argArrayOrDictionary 
                                     at:next 
@@ -5817,11 +5815,11 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.437 2010-08-13 15:11:58 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.438 2010-08-31 09:23:49 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.437 2010-08-13 15:11:58 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.438 2010-08-31 09:23:49 stefan Exp $'
 ! !
 
 CharacterArray initialize!