Mercurial > octave-nkf
changeset 8511:a835406e02dd
load_path::do_set: call clear after disabling add_hook
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 14 Jan 2009 03:28:31 -0500 |
| parents | 738cb6271933 |
| children | 137d6c94212f |
| files | src/ChangeLog src/load-path.cc |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 14 02:07:00 2009 -0500 +++ b/src/ChangeLog Wed Jan 14 03:28:31 2009 -0500 @@ -1,3 +1,8 @@ +2009-01-14 John W. Eaton <jwe@octave.org> + + * load-path.cc (load_path::do_set): Call do_clear after disabling + add_hook. + 2009-01-13 Jaroslav Hajek <highegg@gmail.com> * dirfns.cc (Freadddir): qsort -> sort.
--- a/src/load-path.cc Wed Jan 14 02:07:00 2009 -0500 +++ b/src/load-path.cc Wed Jan 14 03:28:31 2009 -0500 @@ -535,8 +535,6 @@ void load_path::do_set (const std::string& p, bool warn) { - do_clear (); - std::list<std::string> elts = split_path (p); // Temporarily disable add hook. @@ -545,6 +543,8 @@ add_hook = 0; + do_clear (); + for (std::list<std::string>::const_iterator i = elts.begin (); i != elts.end (); i++)