[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))
- [elpa] branch externals/load-dir created (now 0e05b47), Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 843b83a 02/12: epoch-view.el, load-dir.el: Capitalize package description string., Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 4214b44 03/12: * packages/load-dir/load-dir.el (load-dir-one): Avoid infinite recursion., Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 3699a38 04/12: Bump load-dir version number to 0.0.3., Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 30f9f1b 05/12: load-dir: allow ignoring some files, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir f765d85 11/12: * copyright_exceptions: Update for new uni-confusables/gen-confusables.el, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 95c37de 08/12: load-dir: no need for let f, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir fbc39dc 09/12: * load-dir.el: Add `Maintainer:`., Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 5b00991 01/12: Give every package its own directory in packages/, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 3e0c117 06/12: * load-dir/load-dir.el (load-dir-one): Don't set global `f`.,
Stefan Monnier <=
- [elpa] externals/load-dir 4c43bae 07/12: load-dir: fix CL and free variable warnings, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir cbad1ca 10/12: * packages/load-dir/load-dir.el: require just cl-lib 0.5, Stefan Monnier, 2020/11/29
- [elpa] externals/load-dir 0e05b47 12/12: * .gitignore: New file, Stefan Monnier, 2020/11/29