Merge jv
authorHG Automerge
Wed, 11 Jan 2017 12:06:56 +0000
branchjv
changeset 6025 994a12c95b6d
parent 6024 7fdee3dcd61a (current diff)
parent 6020 79c1a6bb497a (diff)
child 6062 0853775c6449
Merge
--- a/Workspace.st	Thu Jan 05 21:05:44 2017 +0000
+++ b/Workspace.st	Wed Jan 11 12:06:56 2017 +0000
@@ -2100,13 +2100,17 @@
                     (lang notNil and:[(printer := lang valuePrinterClass) notNil]) ifTrue:[
                         s := printer printStringForPrintItOf:result
                     ] ifFalse:[
-                        (result isInteger
-                        and:[ result > 10
-                        and:[ InspectorView defaultIntegerDisplayRadix ~= 10 ]]) ifTrue:[
-                            s := result displayString , ' "',(result radixPrintStringRadix: InspectorView defaultIntegerDisplayRadix),'"'.
+                        result isProtoObject ifTrue:[
+                            s := result displayString.
                         ] ifFalse:[
-                            s := result printStringForPrintIt "old: displayString" "very old: printString"
-                        ].
+                            (result isInteger
+                             and:[ result > 10
+                             and:[ InspectorView defaultIntegerDisplayRadix ~= 10]]) ifTrue:[
+                                s := result displayString , ' "',(result radixPrintStringRadix: InspectorView defaultIntegerDisplayRadix),'"'.
+                            ] ifFalse:[
+                                s := result printStringForPrintIt "old: displayString" "very old: printString"
+                            ].
+                        ]
                     ].
                     
                     self withAutoIndent:false do:[