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

* 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.

diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 949d8cbdab94c9ffcc073c11c27277870128e4d6..57ec8a04289d622c7fdf2788304bdc3e5737e440 100644 (file)
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -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'.

diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 2a61e4e9a31048f2b59a3e45ae88f0768310b3e1..d7cd0aceb2154d7da33e7ee40a52ed29de6449dd 100644 (file)
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -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