* packages/load-dir/load-dir.el (load-dir-one): Avoid infinite recursion.

diff --git a/ChangeLog b/ChangeLog
index ac7bc9ad2cea653acc371e910a6a3ebbe6d63c59..36ece0f107f08a8e18b5392c9df16d013e12db76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-28  PJ Weisberg  <pjweisberg@gmail.com>  (tiny change)
+
+       * packages/load-dir/load-dir.el (load-dir-one): Avoid infinite
+       recursion.
+
 2011-05-31  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * packages/uni-confusables-0.1/confusables.txt: Unicode UTS-39

diff --git a/packages/load-dir/load-dir.el b/packages/load-dir/load-dir.el
index f757071dbd29c8b89a0798419f6590e8635f8013..08d375972ef2bbf93be256f680efd35a90745672 100644 (file)
--- a/packages/load-dir/load-dir.el
+++ b/packages/load-dir/load-dir.el
@@ -121,7 +121,7 @@ Recurses into subdirectories if `load-dir-recursive' is t."
           (add-to-list 'load-dir-loaded f))))
 
     (when load-dir-recursive
-      (dolist (f (directory-files dir t))
+      (dolist (f (directory-files dir t directory-files-no-dot-files-regexp))
         (when (file-directory-p f)
           (load-dir-one f))))))