Fix defadvice for directory-files which now has become a problem with

Emacs 24
map7 · Apr 7, 2011 · c80bebb · c80bebb
1 parent dbdd0cd
commit c80bebb
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/find-recursive.el b/find-recursive.el
@@ -65,7 +65,7 @@
 	   (function (lambda (x)
 		       (concat relative-directory x)))
 	   (find-recursive-filter-out '(nil)
-				(directory-files full-dir nil
+				(directory-files1 full-dir nil
 						 file-regexp nil t))))
 	 (inner
 	  (mapcar
@@ -76,7 +76,7 @@
 							 dir "/")
 						 file-regexp)))
 	   (find-recursive-filter-out '(nil "\\." "\\.\\.")
-				(directory-files full-dir nil ".*"
+				(directory-files1 full-dir nil ".*"
 						 nil 'directories)))))
     (mapcar (function (lambda (dir) (setq matches (append matches dir))))
 	    inner)
@@ -99,9 +99,12 @@
 
 (defvar find-recursive-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
 
+(defun directory-files1 (dirname &optional full match nosort files-only)
+  (directory-files dirname full match nosort))
+
 (if find-recursive-running-xemacs
     nil
-  (defadvice directory-files (after
+  (defadvice directory-files1 (after
 			      directory-files-xemacs
 			      (dirname &optional full match nosort files-only)
 			      activate)