Reverted commits 312, 313, and 315.

[gnu-emacs-elpa] / packages / load-dir / load-dir.el

diff --git a/packages/load-dir/load-dir.el b/packages/load-dir/load-dir.el
index 1d4e0b63009c1d697f84ba5e906fc0a583378c18..71b7dffa2add24cb46e69a9e1ab0c47d625ed974 100644 (file)
--- a/packages/load-dir/load-dir.el
+++ b/packages/load-dir/load-dir.el
@@ -1,11 +1,11 @@
-;;; load-dir.el --- load all Emacs Lisp files in given directories
+;;; load-dir.el --- Load all Emacs Lisp files in a given directory
 
 ;; Copyright (C) 2011 Free Software Foundation, Inc
 
 ;; Authors: Teodor Zlatanov <tzz@lifelogs.com>,
 ;;          Ben Key <bkey76@gmail.com>
 ;; With-Help-From: Evans Winner <ego111@gmail.com>, PJ Weisberg <pj@irregularexpressions.net>
-;; Version: 0.0.2
+;; Version: 0.0.3
 ;; Keywords: lisp, files, convenience
 
 ;; This file is part of GNU Emacs.
@@ -31,12 +31,13 @@
 ;; it, so for instance adding a lambda to a hook is usually safe.
 ;;
 ;; You can specify ~/.emacs.d/load.d, a single directory, or a list of
-;; directories.  The file search can be recursive.
+;; directories.  The file search can be recursive.  See the
+;; customizable variable `load-dirs' for details.
 ;;
-;; The intent with ~/.emacs.d/load.d is to give package installers like
+;; The intent of ~/.emacs.d/load.d is to give package installers like
 ;; el-get.el (see https://github.com/dimitri/el-get) and other tools a
-;; way to easily bootstrap themselves without necessarily modifying your
-;; .emacs or custom files directly.
+;; way to easily bootstrap themselves without necessarily modifying
+;; your .emacs or custom files directly.
 
 ;;; Code:
 
@@ -120,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))))))