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

Fix infinite recursion of conf-mode

Browse source 
* lisp/textmodes/conf-mode.el (conf-mode): Inhibit recursion when
called from file-local variables (bug#50126).
This commit is contained in:
Lars Ingebrigtsen 2021-08-20 15:55:24 +02:00
parent 657fe8b9d8
commit c2026cf366
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/textmodes/conf-mode.el
View file

@ -420,7 +420,11 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
(advice-add 'conf-mode :around
(lambda (orig-fun)
"Redirect to one of the submodes when called directly."
(funcall (if delay-mode-hooks orig-fun (conf--guess-mode)))))
;; The file may have "mode: conf" in the local variable
;; block, in which case we'll be called recursively
;; infinitely. Inhibit that.
(let ((enable-local-variables nil))
(funcall (if delay-mode-hooks orig-fun (conf--guess-mode))))))