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

(hack-one-local-variable): Refine last patch (bug#74964)

Browse source 
* lisp/files.el (hack-local-variables--inhibit-eval): Rename from
`hack-local-variables--inhibit`.
(hack-one-local-variable): Skip only those eval forms we're already
in the process of evaluating.
This commit is contained in:
Stefan Monnier 2025-01-17 08:43:50 -05:00
parent 965e50e3ae
commit 4fada67748
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/files.el
View file

@ -4490,15 +4490,15 @@ It is dangerous if either of these conditions are met:
(substitute-command-keys instead)
(format-message "use `%s' instead" instead)))))))
(defvar hack-local-variables--inhibit nil
"List of file/dir local variables to ignore.")
(defvar hack-local-variables--inhibit-eval nil
"List of `eval' forms to ignore in file/dir local variables.")
(defun hack-one-local-variable (var val)
"Set local variable VAR with value VAL.
If VAR is `mode', call `VAL-mode' as a function unless it's
already the major mode."
(pcase var
((guard (memq var hack-local-variables--inhibit)) nil)
((and 'eval (guard (member val hack-local-variables--inhibit-eval))) nil)
('mode
(let ((mode (intern (concat (downcase (symbol-name val))
"-mode"))))
@ -4506,8 +4506,8 @@ already the major mode."
('eval
(pcase val
(`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook)))
(let ((hack-local-variables--inhibit ;; FIXME: Should be buffer-local!
(cons 'eval hack-local-variables--inhibit)))
(let ((hack-local-variables--inhibit-eval ;; FIXME: Should be buffer-local!
(cons val hack-local-variables--inhibit-eval)))
(save-excursion (eval val t))))
(_
(hack-one-local-variable--obsolete var)