diff -r 171ea0df4588 -r d86c8bd5ece3 GenericException.st
--- a/GenericException.st	Fri Oct 28 08:45:38 2011 +0100
+++ b/GenericException.st	Mon Oct 31 22:19:21 2011 +0000
@@ -1511,7 +1511,7 @@
      VW compatibility."
 
     self isResumable ifTrue:[
-        self resume:(self defaultResumeValue)
+        self proceedWith:(self defaultResumeValue)
     ] ifFalse:[
         self return:(self defaultReturnValue)
     ]
@@ -1524,7 +1524,7 @@
      VW compatibility."
 
     self isResumable ifTrue:[
-        self resume:value
+        self proceedWith:value
     ] ifFalse:[
         self return:value
     ]
@@ -1621,8 +1621,9 @@
     |con|
 
     con := self returnableSuspendedContext.
+    thisContext evaluateUnwindActionsUpTo:con.
     handlerContext := suspendedContext := raiseContext := nil.
-    con unwindThenDo:[anotherException raiseSignal].
+    con returnDoing:[anotherException raiseSignal]
 
     "
      |rslt|
@@ -1671,8 +1672,9 @@
     |con|
 
     con := handlerContext.
+    thisContext evaluateUnwindActionsUpTo:con.
     handlerContext := suspendedContext := raiseContext := nil.
-    con unwindAndRestart
+    con restart
 
     "
      |rslt n|
@@ -1701,9 +1703,11 @@
 "/            handle:(handlerContext argAt:1)
 "/            do:aBlock
 "/    ].
-    handlerContext := suspendedContext := raiseContext := nil.
+
     con receiver handlerProtectedBlock:aBlock inContext:con.
-    con unwindAndRestart
+    thisContext evaluateUnwindActionsUpTo:con.
+    handlerContext := suspendedContext := raiseContext := nil.
+    con restart
 
     "
      |sig rslt|
@@ -1779,8 +1783,9 @@
     |con|
 
     con := handlerContext.
+    thisContext evaluateUnwindActionsUpTo:con.
     handlerContext := suspendedContext := raiseContext := nil.
-    con unwind:(self defaultReturnValue)
+    con return:(self defaultReturnValue)
 
     "Modified: / 7.9.2001 / 13:29:34 / cg"
 !
@@ -1791,8 +1796,9 @@
     |con|
 
     con := handlerContext.
+    thisContext evaluateUnwindActionsUpTo:con.
     handlerContext := suspendedContext := raiseContext := nil.
-    con unwind:value
+    con return:value.
 
     "Modified: 27.3.1997 / 16:46:51 / cg"
 !
@@ -1805,8 +1811,9 @@
     |con|
 
     con := handlerContext.
+    thisContext evaluateUnwindActionsUpTo:con.
     handlerContext := suspendedContext := raiseContext := nil.
-    con unwindThenDo:aBlock
+    con returnDoing:aBlock
 
     "
         [
@@ -2297,15 +2304,16 @@
 !GenericException class methodsFor:'documentation'!
 
 version
-    ^ '$Id: GenericException.st 10700 2011-09-29 15:44:37Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.131 2011/10/27 22:28:12 stefan Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.130 2011/02/10 11:30:47 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.131 2011/10/27 22:28:12 stefan Exp '
 !
 
 version_SVN
-    ^ '$Id: GenericException.st 10700 2011-09-29 15:44:37Z vranyj1 $'
+    ^ '$Id: GenericException.st 10729 2011-10-31 22:19:21Z vranyj1 $'
 ! !
 
 GenericException initialize!
+