# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1249895686 -7200
# Node ID 6ab2598a4ac23f168932d780f468606051800d74
# Parent  0cb90d7fe46ae7415cc47cb92635b2fc607a5815
parse.y (Fevalin): also return output from CATCH expression

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-09  John W. Eaton  <jwe@octave.org>
+
+	* parse.y (Fevalin): Also return output from CATCH expression.
+
 2009-08-06  Jaroslav Hajek  <highegg@gmail.com>
 
 	* OPERATORS/op-dm-template.cc, OPERATORS/op-pm-template.cc:
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
@@ -4280,9 +4280,10 @@
 
 		  buffer_error_messages--;
 
-		  eval_string (args(2), 0, parse_status, nargout);
-
-		  retval = octave_value_list ();
+		  tmp = eval_string (args(2), nargout > 0,
+				     parse_status, nargout);
+
+		  retval = (nargout > 0) ? tmp : octave_value_list ();
 		}
 	    }