# HG changeset patch
# User jwe
# Date 1187969810 0
# Node ID 59e22e30aff870153b0001eec92cf474e261b708
# Parent  b8c0287846ce8da6c18f599af5c305a1b5d8b0b4
[project @ 2007-08-24 15:36:49 by jwe]

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -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, 
diff --git a/scripts/set/intersect.m b/scripts/set/intersect.m
--- a/scripts/set/intersect.m
+++ b/scripts/set/intersect.m
@@ -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
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/load-path.cc b/src/load-path.cc
--- a/src/load-path.cc
+++ b/src/load-path.cc
@@ -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);
 	    }
 	}
     }