branch: master
commit cdac7cac9924321dd895c7f1047c61055ff1002f
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* load-dir/load-dir.el (load-dir-one): Don't set global `f`.
---
packages/load-dir/load-dir.el | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/packages/load-dir/load-dir.el b/packages/load-dir/load-dir.el
index 704f377..9f7b06d 100644
--- a/packages/load-dir/load-dir.el
+++ b/packages/load-dir/load-dir.el
@@ -119,17 +119,17 @@ Recurses into subdirectories if `load-dir-recursive' is
t."
(directory-files dir t)))
(when (and (not (file-directory-p full))
(member (file-name-extension full t) suffixes))
- (setq f (file-name-sans-extension full))
- (cond
- ((member f load-dir-loaded)
- (load-dir-debug "Skipping %s, it's already loaded." f))
- ((cl-some (lambda (regexp) (string-match-p regexp full))
load-dir-ignored)
- (load-dir-debug "Ignoring %s as per `load-dir-ignored'." full))
- (t
- (if load-dir-ignore-errors
- (with-demoted-errors (load f))
- (load f))
- (add-to-list 'load-dir-loaded f)))))
+ (let ((f (file-name-sans-extension full)))
+ (cond
+ ((member f load-dir-loaded)
+ (load-dir-debug "Skipping %s, it's already loaded." f))
+ ((cl-some (lambda (regexp) (string-match-p regexp full))
load-dir-ignored)
+ (load-dir-debug "Ignoring %s as per `load-dir-ignored'." full))
+ (t
+ (if load-dir-ignore-errors
+ (with-demoted-errors (load f))
+ (load f))
+ (add-to-list 'load-dir-loaded f))))))
(when load-dir-recursive
(dolist (f (directory-files dir t directory-files-no-dot-files-regexp))
