--- a/DebugView.st	Sun Jun 23 10:26:25 2013 +0200
+++ b/DebugView.st	Sun Jun 23 10:32:07 2013 +0200
@@ -2349,10 +2349,18 @@
         s := 'Send next message (enter into called methods)'
     ].
     aComponent == returnButton ifTrue:[
-        s := 'Return from selected method'
+        restartButton enabled ifTrue:[
+            s := 'Return from the selected method'
+        ] ifFalse:[
+            s := 'Return from the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
+        ]
     ].
     aComponent == restartButton ifTrue:[
-        s := 'Restart selected method'
+        restartButton enabled ifTrue:[
+            s := 'Restart the selected method'
+        ] ifFalse:[
+            s := 'Restart the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
+        ]
     ].
     aComponent == monitorToggle ifTrue:[
         s := 'Toggle monitoring'
@@ -2469,10 +2477,18 @@
         s := 'HELP_SEND'
     ].
     aComponent == returnButton ifTrue:[
-        s := 'HELP_RETURN'
+        returnButton enabled ifTrue:[
+            s := 'HELP_RETURN'
+        ] ifFalse:[
+            s := 'HELP_RETURN_DISABLED'
+        ].
     ].
     aComponent == restartButton ifTrue:[
-        s := 'HELP_RESTART'
+        restartButton enabled ifTrue:[
+            s := 'HELP_RESTART'
+        ] ifFalse:[
+            s := 'HELP_RESTART_DISABLED'
+        ].
     ].
     aComponent == contextView ifTrue:[
         s := 'HELP_WALKBACK'
@@ -8497,15 +8513,15 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.596 2013-06-20 23:00:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.596 2013-06-20 23:00:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: DebugView.st,v 1.596 2013-06-20 23:00:24 cg Exp $'
+    ^ '$Id: DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
 ! !