--- a/ClassDescr.st	Fri Aug 22 19:56:29 1997 +0200
+++ b/ClassDescr.st	Thu Aug 28 04:42:37 1997 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+'From Smalltalk/X, Version:3.1.9 on 26-aug-1997 at 1:57:46 pm'                  !
+
 Behavior subclass:#ClassDescription
 	instanceVariableNames:'instvars'
 	classVariableNames:'UpdatingChanges LockChangesFile FileOutErrorSignal
@@ -304,9 +306,26 @@
      variable. The returned number is 1..instSize for valid variable names, nil for
      illegal names."
 
-    ^ self allInstVarNames lastIndexOf:aVariableName ifAbsent:nil
-
-    "Modified: 7.4.1997 / 16:59:39 / cg"
+    |i cls vars|
+
+    cls := self.
+    [cls notNil] whileTrue:[
+        vars := cls instVarNames.
+        i := vars indexOf:aVariableName.
+        i ~~ 0 ifTrue:[
+            ^ (cls superclass instSize) + i
+        ].
+        cls := cls superclass
+    ].
+    ^ nil
+
+    "
+     Point instVarOffsetOf:'x' 
+     View instVarOffsetOf:'paint'
+     Button instVarOffsetOf:'logo' 
+    "
+
+    "Modified: 23.8.1997 / 16:59:15 / cg"
 !
 
 instanceVariableOffsets
@@ -2505,6 +2524,6 @@
 !ClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ClassDescr.st,v 1.51 1997-08-22 15:52:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ClassDescr.st,v 1.52 1997-08-28 02:42:33 cg Exp $'
 ! !
 ClassDescription initialize!

--- a/ClassDescription.st	Fri Aug 22 19:56:29 1997 +0200
+++ b/ClassDescription.st	Thu Aug 28 04:42:37 1997 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+'From Smalltalk/X, Version:3.1.9 on 26-aug-1997 at 1:57:46 pm'                  !
+
 Behavior subclass:#ClassDescription
 	instanceVariableNames:'instvars'
 	classVariableNames:'UpdatingChanges LockChangesFile FileOutErrorSignal
@@ -304,9 +306,26 @@
      variable. The returned number is 1..instSize for valid variable names, nil for
      illegal names."
 
-    ^ self allInstVarNames lastIndexOf:aVariableName ifAbsent:nil
-
-    "Modified: 7.4.1997 / 16:59:39 / cg"
+    |i cls vars|
+
+    cls := self.
+    [cls notNil] whileTrue:[
+        vars := cls instVarNames.
+        i := vars indexOf:aVariableName.
+        i ~~ 0 ifTrue:[
+            ^ (cls superclass instSize) + i
+        ].
+        cls := cls superclass
+    ].
+    ^ nil
+
+    "
+     Point instVarOffsetOf:'x' 
+     View instVarOffsetOf:'paint'
+     Button instVarOffsetOf:'logo' 
+    "
+
+    "Modified: 23.8.1997 / 16:59:15 / cg"
 !
 
 instanceVariableOffsets
@@ -2505,6 +2524,6 @@
 !ClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.51 1997-08-22 15:52:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.52 1997-08-28 02:42:33 cg Exp $'
 ! !
 ClassDescription initialize!

--- a/Process.st	Fri Aug 22 19:56:29 1997 +0200
+++ b/Process.st	Thu Aug 28 04:42:37 1997 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+'From Smalltalk/X, Version:3.1.9 on 26-aug-1997 at 3:52:33 pm'                  !
+
 Link subclass:#Process
 	instanceVariableNames:'id prio state startBlock name restartable interruptActions
 		exitActions suspendSemaphore singleStepping
@@ -1390,14 +1392,15 @@
 
     ProcessorScheduler knownProcesses do:[:aProcess |
         aProcess ~~ self ifTrue:[
-            aProcess processGroupId == processGroupId ifTrue:[
+            (aProcess processGroupId == processGroupId 
+            or:[aProcess processGroupId == id]) ifTrue:[
                 aProcess terminateWithAllSubprocesses
             ]
         ]
     ].
 
-    "Modified: 28.10.1996 / 20:40:50 / cg"
     "Created: 28.10.1996 / 20:43:32 / cg"
+    "Modified: 26.8.1997 / 03:09:40 / cg"
 !
 
 terminateGroup
@@ -1447,14 +1450,15 @@
 
     ProcessorScheduler knownProcesses do:[:aProcess |
         aProcess ~~ self ifTrue:[
-            aProcess processGroupId == processGroupId ifTrue:[
+            (aProcess processGroupId == processGroupId 
+            or:[aProcess processGroupId == id]) ifTrue:[
                 aProcess terminate
             ]
         ]
     ].
 
-    "Modified: 28.10.1996 / 20:40:50 / cg"
     "Created: 28.10.1996 / 20:41:49 / cg"
+    "Modified: 26.8.1997 / 03:09:57 / cg"
 !
 
 terminateWithAllSubprocesses
@@ -1471,6 +1475,6 @@
 !Process class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Process.st,v 1.86 1997-08-22 14:32:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Process.st,v 1.87 1997-08-28 02:42:37 cg Exp $'
 ! !
 Process initialize!