emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/load-dir 3e0c117 06/12: * load-dir/load-dir.el (load-di


From: Stefan Monnier
Subject: [elpa] externals/load-dir 3e0c117 06/12: * load-dir/load-dir.el (load-dir-one): Don't set global `f`.
Date: Sun, 29 Nov 2020 14:31:18 -0500 (EST)

branch: externals/load-dir
commit 3e0c117d3a05c9f82c05365c4f422e398bebf5ca
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * load-dir/load-dir.el (load-dir-one): Don't set global `f`.
---
 load-dir.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/load-dir.el b/load-dir.el
index 704f377..9f7b06d 100644
--- a/load-dir.el
+++ b/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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]