Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -r1.40.2.1 -r1.40.2.2
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	28 Feb 2007 11:12:39 -0000	1.40.2.1
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	28 Feb 2007 14:55:10 -0000	1.40.2.2
@@ -186,7 +186,7 @@
   template::util::lpop parse_level
 
   switch $return_code {
-    0 {
+    0 - 2 {
       # CODE executed without a non-local exit -- return what it
       # evaluated to.
       return $return_value
@@ -195,10 +195,6 @@
       # Error
       return -code error -errorinfo $s_errorInfo -errorcode $s_errorCode $return_value
     }
-    2 {
-      # Return from the caller.
-      return -code return $return_value
-    }
     default {
       if { [string equal $return_value ADP_ABORT] } { 
         # return without rendering any HTML if the code aborts