mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-03 04:21:28 -08:00
Code Issues Projects Releases Wiki Activity

; Fix 'prepare-user-lisp' that always add directory to 'load-path'

Browse source 
* lisp/startup.el (prepare-user-lisp): Filter out directory matching
any of 'user-lisp-ignored-directories'.  (Bug#79978)
This commit is contained in:
Pierre Téchoueyres 2025-12-11 19:21:55 +01:00 • committed by Philip Kaludercic
parent 10d022741c
commit cc4f23302c
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/startup.el
View file

@ -1251,11 +1251,11 @@ unconditionally."
(unless autoload-file
(setq autoload-file (expand-file-name ".user-lisp-autoloads.el"
user-lisp-directory)))
(let* ((pred
(let ((ignored
(concat "\\`" (regexp-opt user-lisp-ignored-directories) "\\'")))
(lambda (dir)
(not (string-match-p ignored (file-name-nondirectory dir))))))
(let* ((ignored
(concat "\\`" (regexp-opt user-lisp-ignored-directories) "\\'"))
(pred
(lambda (dir)
(not (string-match-p ignored (file-name-nondirectory dir)))))
(dir (expand-file-name user-lisp-directory))
(backup-inhibited t)
(dirs (list dir)))
@ -1268,7 +1268,8 @@ unconditionally."
(byte-recompile-file file force 0)
(when (native-comp-available-p)
(native-compile-async file)))))
((file-directory-p file)
((and (file-directory-p file)
(not (string-match-p ignored (file-name-nondirectory file))))
(add-to-list 'load-path (directory-file-name file))
(push file dirs))))
(unless just-activate