# HG changeset patch
# User Rik <rik@octave.org>
# Date 1442916494 25200
# Node ID 19617a5b7202e68e551fa293729e2734244375eb
# Parent  1339ad3c9faa2fb7cdb5e2c9d1de89ee99682597
Fix regression in displayed error message for nargin and nargout.

* ov-usr-fcn.cc (nargin, nargout): After printing error message, use
'return retval' to immediately break out of the function.

diff -r 1339ad3c9faa -r 19617a5b7202 libinterp/octave-value/ov-usr-fcn.cc
--- a/libinterp/octave-value/ov-usr-fcn.cc	Tue Sep 22 02:06:17 2015 -0700
+++ b/libinterp/octave-value/ov-usr-fcn.cc	Tue Sep 22 03:08:14 2015 -0700
@@ -866,7 +866,10 @@
           std::string name = func.string_value ();
           func = symbol_table::find_function (name);
           if (func.is_undefined ())
-            error ("nargout: invalid function name: %s", name.c_str ());
+            {
+              error ("nargin: invalid function name: %s", name.c_str ());
+              return retval;
+            }
         }
 
       octave_function *fcn_val = func.function_value ();
@@ -973,7 +976,10 @@
           std::string name = func.string_value ();
           func = symbol_table::find_function (name);
           if (func.is_undefined ())
-            error ("nargout: invalid function name: %s", name.c_str ());
+            {
+              error ("nargout: invalid function name: %s", name.c_str ());
+              return retval;
+            }
         }
 
       if (func.is_inline_function ())