Mercurial > octave-nkf
changeset 6254:5b43c2332b69
[project @ 2007-01-29 17:35:15 by jwe]
| author | jwe |
|---|---|
| date | Mon, 29 Jan 2007 17:35:15 +0000 |
| parents | f1676652d808 |
| children | c97a1cdea9e7 |
| files | scripts/ChangeLog scripts/pkg/pkg.m src/ChangeLog src/DLD-FUNCTIONS/find.cc |
| diffstat | 4 files changed, 23 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Jan 24 20:43:37 2007 +0000 +++ b/scripts/ChangeLog Mon Jan 29 17:35:15 2007 +0000 @@ -1,5 +1,8 @@ 2007-01-24 David Bateman <dbateman@free.fr> + * pkg/pkg.m: Install ChangeLog file if it exists. + Delete bare newline in string passed to write_INDEX. + * sparse/sprandsym.m: Make work for even values of N. 2007-01-24 John W. Eaton <jwe@octave.org>
--- a/scripts/pkg/pkg.m Wed Jan 24 20:43:37 2007 +0000 +++ b/scripts/pkg/pkg.m Mon Jan 29 17:35:15 2007 +0000 @@ -765,6 +765,16 @@ error("Couldn't copy COPYING: %s", output); endif + ## If the file ChangeLog exists, copy it + fChangeLog = fullfile(packdir, "ChangeLog"); + if (exist(fChangeLog, "file")) + [status, output] = copyfile(fChangeLog, packinfo); + if (status != 1) + rm_rf(desc.dir); + error("Couldn't copy ChangeLog file: %s", output); + endif + endif + ## Is there an INDEX file to copy or should we generate one? fINDEX = fullfile(packdir, "INDEX"); if (exist(fINDEX, "file")) @@ -775,8 +785,7 @@ endif else try - write_INDEX(desc, fullfile(packdir, "inst"), fullfile(packinfo, "IND -EX")); + write_INDEX(desc, fullfile(packdir, "inst"), fullfile(packinfo, "INDEX")); catch rm_rf(desc.dir); error(lasterr);
--- a/src/ChangeLog Wed Jan 24 20:43:37 2007 +0000 +++ b/src/ChangeLog Mon Jan 29 17:35:15 2007 +0000 @@ -1,3 +1,8 @@ +2007-01-29 David Bateman <dbateman@free.fr> + + * DLD-FUNCTIONS/find.cc (find_nonzero_elem_idx): Don't panic if + nargout is greater than 3. + 2007-01-24 John W. Eaton <jwe@octave.org> * pt-assgn.cc (former_built_in_variables): New static data.
--- a/src/DLD-FUNCTIONS/find.cc Wed Jan 24 20:43:37 2007 +0000 +++ b/src/DLD-FUNCTIONS/find.cc Mon Jan 29 17:35:15 2007 +0000 @@ -153,11 +153,7 @@ switch (nargout) { - case 0: - case 1: - retval(0) = idx; - break; - + default: case 3: retval(2) = val; // Fall through! @@ -167,8 +163,9 @@ retval(0) = i_idx; break; - default: - panic_impossible (); + case 1: + case 0: + retval(0) = idx; break; }