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

Fix up previous conf-mode/tex-mode redirection hacks

Browse source 
* lisp/textmodes/conf-mode.el (conf-mode):
* lisp/textmodes/tex-mode.el (tex--redirect-to-submode): The
previous hack to these redirections would disable all local
variables.  Try to work around this a bit more.
This commit is contained in:
Lars Ingebrigtsen 2021-08-25 11:41:38 +02:00
parent efaed29f3d
commit 7782ccd6de
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -417,16 +417,18 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode',
;; To tell the difference between those two cases where the function
;; might be called, we check `delay-mode-hooks'.
;; (inspired from tex-mode.el)
(defvar conf-mode--recursing nil)
(advice-add 'conf-mode :around
(lambda (orig-fun)
"Redirect to one of the submodes when called directly."
;; 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))))))
(let ((conf-mode--recursing conf-mode--recursing))
(funcall (if (or delay-mode-hooks conf-mode--recursing)
orig-fun
(setq conf-mode--recursing t)
(conf--guess-mode))))))
(defun conf-mode-initialize (comment &optional font-lock)
"Initializations for sub-modes of `conf-mode'.

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

@ -1014,15 +1014,17 @@ says which mode to use."
(tex-common-initialization))
(advice-add 'tex-mode :around #'tex--redirect-to-submode)
(defvar tex-mode--recursing nil)
(defun tex--redirect-to-submode (orig-fun)
"Redirect to one of the submodes when called directly."
;; The file may have "mode: tex" 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
(let ((tex-mode--recursing tex-mode--recursing))
(funcall (if (or delay-mode-hooks tex-mode--recursing)
;; We're called from one of the children already.
orig-fun
(setq tex-mode--recursing t)
(tex--guess-mode)))))
;; The following three autoloaded aliases appear to conflict with