Mercurial > hg > octave-shane
changeset 7346:40252ccfcb67
[project @ 2008-01-04 20:26:25 by jwe]
author | jwe |
---|---|
date | Fri, 04 Jan 2008 20:26:26 +0000 |
parents | 74075b3b54c1 |
children | 0fa079d04772 |
files | scripts/ChangeLog scripts/strings/strtrim.m src/ChangeLog src/symtab.h |
diffstat | 4 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2008-01-04 Thomas Treichl <Thomas.Treichl@gmx.net> + + * strings/strtrim.m: Doc fix. + 2008-01-04 Muthiah Annamalai <muthuspost@gmail.com> * general/sub2ind.m, general/ind2sub.m: Doc fix.
--- a/scripts/strings/strtrim.m +++ b/scripts/strings/strtrim.m @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 2007 Kurt Hornik +## Copyright (C) 1996, 2007, 2008 Kurt Hornik ## ## This file is part of Octave. ## @@ -16,11 +16,13 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. -## -*- texinfo -*- @deftypefn {Function File} {} deblank (@var{s}) +## -*- texinfo -*- +## @deftypefn {Function File} {} deblank (@var{s}) ## Remove leading and trailing blanks and nulls from @var{s}. If ## @var{s} is a matrix, @var{deblank} trims each row to the length of ## longest string. If @var{s} is a cell array, operate recursively on -## each element of the cell array. @end deftypefn +## each element of the cell array. +## @end deftypefn ## Author: John Swensen <jpswensen@jhu.edu>
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-01-04 John W. Eaton <jwe@octave.org> + + * symtab.h (symbol_table:pop_scope): Avoid accessing beyond end of + scope_stack. + 2008-01-04 David Bateman <dbateman@free.fr> * ov-mapper.cc (SPARSE_MAPPER_LOOP_2): Use data method instead of
--- a/src/symtab.h +++ b/src/symtab.h @@ -1,7 +1,7 @@ /* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, - 2004, 2005, 2006, 2007 John W. Eaton + 2004, 2005, 2006, 2007, 2008 John W. Eaton This file is part of Octave. @@ -657,7 +657,7 @@ set_scope (scope_stack[0]); - xcurrent_caller_scope = scope_stack[1]; + xcurrent_caller_scope = scope_stack.size () > 1 ? scope_stack[1] : -1; } static void pop_scope (void *) { pop_scope (); }