# HG changeset patch # User jwe # Date 1108471704 0 # Node ID dd07ee8af4b3c93d8c51a8903ec4f8cd3c75773b # Parent 25b090e1be9f3cdd1df5f60fbc58873707311987 [project @ 2005-02-15 12:48:24 by jwe] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2005-02-15 John W. Eaton + * dirfns.cc (deftypefn): Don't print to octave_stdout if nargout > 0. + * pt-mat.cc (tree_matrix::rvalue): Min size of ra_idx is 2. * file-io.cc (Ffclear): New function. diff --git a/src/dirfns.cc b/src/dirfns.cc --- a/src/dirfns.cc +++ b/src/dirfns.cc @@ -191,18 +191,19 @@ for (;;) { if (cmd->get (ch)) - { - octave_stdout << ch; - output_buf << ch; - } + output_buf << ch; else break; } output_buf << OSSTREAM_ENDS; + std::string output = OSSTREAM_STR (output_buf); + if (nargout > 0) - retval = OSSTREAM_STR (output_buf); + retval = output; + else + octave_stdout << output; OSSTREAM_FREEZE (output_buf); }