Mercurial > octave
changeset 25389:f241f62c9fc5
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 17 May 2018 11:55:18 -0700 |
parents | dd77a0628cce (current diff) 644fe81ced33 (diff) |
children | 8c10ad441b24 |
files | libinterp/corefcn/help.cc |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/help.cc Wed May 16 22:03:10 2018 -0700 +++ b/libinterp/corefcn/help.cc Thu May 17 11:55:18 2018 -0700 @@ -488,16 +488,16 @@ octave_user_code *curr_fcn = cs.caller_user_code (); - if (! curr_fcn) - return retval; - // All subfunctions are listed in the top-level function of this file. - while (curr_fcn->is_subfunction ()) + while (curr_fcn && curr_fcn->is_subfunction ()) { symbol_scope pscope = curr_fcn->parent_fcn_scope (); curr_fcn = pscope.function (); } + if (! curr_fcn) + return retval; + // Get subfunctions. const std::list<std::string> names = curr_fcn->subfunction_names ();
--- a/libinterp/corefcn/time.cc Wed May 16 22:03:10 2018 -0700 +++ b/libinterp/corefcn/time.cc Thu May 17 11:55:18 2018 -0700 @@ -108,8 +108,8 @@ @deftypefn {} {@var{seconds} =} time () Return the current time as the number of seconds since the epoch. -The epoch is referenced to 00:00:00 CUT (Coordinated Universal Time) 1 Jan -1970. For example, on Monday February 17, 1997 at 07:15:06 CUT, the value +The epoch is referenced to 00:00:00 UTC (Coordinated Universal Time) 1 Jan +1970. For example, on Monday February 17, 1997 at 07:15:06 UTC, the value returned by @code{time} was 856163706. @seealso{strftime, strptime, localtime, gmtime, mktime, now, date, clock, datenum, datestr, datevec, calendar, weekday} @end deftypefn */) @@ -130,7 +130,7 @@ doc: /* -*- texinfo -*- @deftypefn {} {@var{tm_struct} =} gmtime (@var{t}) Given a value returned from @code{time}, or any non-negative integer, -return a time structure corresponding to CUT (Coordinated Universal Time). +return a time structure corresponding to UTC (Coordinated Universal Time). For example: