Merge jv
authorMerge Script
Sun, 09 Aug 2015 06:38:26 +0200
branchjv
changeset 15792 669d9fccbff6
parent 15787 7b974ea37d2f (current diff)
parent 15791 139e5f158267 (diff)
child 15794 79633fa7bf15
Merge
Tools__CodeHighlightingService.st
Tools__CodeView2.st
extensions.st
stx_libtool.st
--- a/Tools__CodeHighlightingService.st	Fri Aug 07 06:56:41 2015 +0200
+++ b/Tools__CodeHighlightingService.st	Sun Aug 09 06:38:26 2015 +0200
@@ -64,6 +64,7 @@
 "
 ! !
 
+
 !CodeHighlightingService class methodsFor:'accessing'!
 
 label
@@ -392,14 +393,14 @@
 !CodeHighlightingService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.53 2015-02-27 13:23:46 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.53 2015-02-27 13:23:46 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeHighlightingService.st,v 1.53 2015-02-27 13:23:46 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/Tools__CodeView2.st	Fri Aug 07 06:56:41 2015 +0200
+++ b/Tools__CodeView2.st	Sun Aug 09 06:38:26 2015 +0200
@@ -3566,12 +3566,12 @@
                     ^  self
                 ].
             ] ifFalse:[
-                "/ (ln copyFrom:prevTab+1 to:cursorCol-1) isBlank ifTrue:[
+                (ln copyFrom:prevTab+1 to:cursorCol-1) isBlank ifTrue:[
                     self deleteFromLine:cursorLine col:prevTab toLine:cursorLine col:cursorCol-1.
                     self cursorLine:cursorLine col:prevTab.
                     wasOn ifTrue:[ self showCursor ].
                     ^  self.
-                "/ ]
+                ]
             ]
         ].
     ].
--- a/extensions.st	Fri Aug 07 06:56:41 2015 +0200
+++ b/extensions.st	Sun Aug 09 06:38:26 2015 +0200
@@ -1926,6 +1926,29 @@
     ^ #windowClassBrowserIcon
 ! !
 
+!SmallInteger methodsFor:'inspecting'!
+
+inspectorExtraAttributes
+    "extra (pseudo instvar) entries to be shown in an inspector."
+
+    |extra|
+    
+    extra := super inspectorExtraAttributes.
+    self < 0 ifTrue:[
+        extra     
+            add:'-hexadecimal (unsigned)' -> [ self asUnsignedInt radixPrintStringRadix:16 ].
+    ].
+    ^ extra
+
+    "
+     123 inspect
+     -123 inspect
+    "
+
+    "Created: / 18-09-2006 / 21:22:46 / cg"
+    "Modified: / 06-10-2006 / 13:57:28 / cg"
+! !
+
 !Smalltalk class methodsFor:'misc ui support'!
 
 inspectorClass
--- a/stx_libtool.st	Fri Aug 07 06:56:41 2015 +0200
+++ b/stx_libtool.st	Sun Aug 09 06:38:26 2015 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -598,6 +596,7 @@
         'Warning class' iconInBrowserSymbol
         Object inspectorClass
         'Date class' iconInBrowserSymbol
+        SmallInteger inspectorExtraAttributes
     )
 ! !