# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1231921711 18000
# Node ID a835406e02dd18cd7ec66578738af6c5d29eee67
# Parent  738cb6271933f66e816114182784790c1c2db8c8
load_path::do_set: call clear after disabling add_hook

diff -r 738cb6271933 -r a835406e02dd src/ChangeLog
--- 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.
diff -r 738cb6271933 -r a835406e02dd src/load-path.cc
--- 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++)