Mercurial > octave-nkf
changeset 6825:59e22e30aff8
[project @ 2007-08-24 15:36:49 by jwe]
| author | jwe |
|---|---|
| date | Fri, 24 Aug 2007 15:36:50 +0000 |
| parents | b8c0287846ce |
| children | 8618f29520c6 |
| files | scripts/ChangeLog scripts/set/intersect.m src/ChangeLog src/load-path.cc |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Fri Aug 24 09:27:13 2007 +0000 +++ b/scripts/ChangeLog Fri Aug 24 15:36:50 2007 +0000 @@ -1,3 +1,7 @@ +2007-08-24 Michael Goffioul <michael.goffioul@gmail.com> + + * set/intersect.m: Make it work with cell arrays of strings. + 2007-08-24 David Bateman <dbateman@free.fr> * geometry/convhull.m, geometry/delaunay.m, geometry/delaunay3.m,
--- a/scripts/set/intersect.m Fri Aug 24 09:27:13 2007 +0000 +++ b/scripts/set/intersect.m Fri Aug 24 15:36:50 2007 +0000 @@ -46,7 +46,11 @@ c = [a(:); b(:)]; [c, ic] = sort (c); ## [a(:);b(:)](ic) == c - ii = find( c(1:end-1) == c(2:end) ); + if (iscellstr (c)) + ii = find (strcmp (c(1:end-1), c(2:end))); + else + ii = find (c(1:end-1) == c(2:end)); + endif c = c(ii); ## The answer ia = ja(ic(ii)); ## a(ia) == c
--- a/src/ChangeLog Fri Aug 24 09:27:13 2007 +0000 +++ b/src/ChangeLog Fri Aug 24 15:36:50 2007 +0000 @@ -1,3 +1,8 @@ +2007-08-24 John W. Eaton <jwe@octave.org> + + * load-path.cc (load_path::do_remove): Call remove_hook function + before removing directory from list. + 2007-08-24 David Bateman <dbateman@free.fr> * ov-bool-sparse.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): Class
--- a/src/load-path.cc Fri Aug 24 09:27:13 2007 +0000 +++ b/src/load-path.cc Fri Aug 24 15:36:50 2007 +0000 @@ -552,6 +552,9 @@ { retval = true; + if (remove_hook) + remove_hook (dir); + string_vector fcn_files = i->fcn_files; dir_info_list.erase (i); @@ -590,9 +593,6 @@ } } } - - if (remove_hook) - remove_hook (dir); } } }