# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1249814359 14400
# Node ID 4562a9a730aee18f0eed65950ad1360b150f3ed8
# Parent  a321a1c227c83c4a9e6f632a3084dca25a316e01
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-08  Jaroslav Hajek  <highegg@gmail.com>
 
 	* data.cc (Fifelse): Rename to Fmerge, alias to Fifelse.
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
@@ -4572,9 +4572,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 ();
 		}
 	    }