procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(dir-locals-collect-variables): Don't autoload if not needed (bug#74349)

Browse source 
While dir-local settings for `c-mode` may require (auto)loading `cc-mode.el`
to get all the `safe-local-variable` properties, they may not.  So before
(auto)loading that file, make sure we don't already have all the
`safe-local-variable` properties we need.

* lisp/files.el (dir-locals--load-mode-if-needed): New function.
(hack-one-local-variable): Don't inf-loop if `eval` calls a major mode.
(dir-locals-collect-variables): Use `dir-locals--load-mode-if-needed`.
This commit is contained in:
Stefan Monnier 2024-11-23 22:05:33 -05:00
parent e71d714a81
commit f713258416
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lisp/files.el
View file

@ -4438,7 +4438,8 @@ already the major mode."
('eval
(pcase val
(`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook)))
(save-excursion (eval val t)))
(let ((enable-local-variables nil)) ;FIXME: Should be buffer-local!
(save-excursion (eval val t))))
(_
(hack-one-local-variable--obsolete var)
;; Make sure the string has no text properties.
@ -4484,6 +4485,21 @@ Returns the new list."
;; Need a new cons in case we setcdr later.
(push (cons variable value) variables)))))
(defun dir-locals--load-mode-if-needed (key alist)
;; If KEY is an extra parent it may remain not loaded
;; (hence with some of its mode-specific vars missing their
;; `safe-local-variable' property), leading to spurious
;; prompts about unsafe vars (bug#68246).
(when (and (symbolp key) (autoloadp (indirect-function key)))
(let ((unsafe nil))
(pcase-dolist (`(,var . ,_val) alist)
(unless (or (memq var '(mode eval))
(get var 'safe-local-variable))
(setq unsafe t)))
(when unsafe
(ignore-errors
(autoload-do-load (indirect-function key)))))))
(defun dir-locals-collect-variables (class-variables root variables
&optional predicate)
"Collect entries from CLASS-VARIABLES into VARIABLES.
@ -4514,15 +4530,9 @@ to see whether it should be considered."
(funcall predicate key)
(or (not key)
(derived-mode-p key)))
;; If KEY is an extra parent it may remain not loaded
;; (hence with some of its mode-specific vars missing their
;; `safe-local-variable' property), leading to spurious
;; prompts about unsafe vars (bug#68246).
(if (and (symbolp key) (autoloadp (indirect-function key)))
(ignore-errors (autoload-do-load (indirect-function key))))
(let* ((alist (cdr entry))
(subdirs (assq 'subdirs alist)))
(if (or (not subdirs)
(when (or (not subdirs)
(progn
(setq alist (remq subdirs alist))
(cdr-safe subdirs))
@ -4531,6 +4541,7 @@ to see whether it should be considered."
;; variables apply to this directory and N levels
;; below it (0 == nil).
(equal root (expand-file-name default-directory)))
(dir-locals--load-mode-if-needed key alist)
(setq variables (dir-locals-collect-mode-variables
alist variables))))))))
(error