From bae62f54cb60ed6767c608ddc1d2226748d71325 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 25 Feb 2024 11:35:44 -0500 Subject: [PATCH] * lisp/files.el (hack-one-local-variable): Use `set-auto-mode-0` This fixes bug#69373. (cherry picked from commit b7cef701cb587ecb66f192e4d41aa202645560e0) --- lisp/files.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index bacb07f2a9f..ba3f0349aec 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4375,10 +4375,8 @@ already the major mode." (pcase var ('mode (let ((mode (intern (concat (downcase (symbol-name val)) - "-mode")))) - (unless (eq (indirect-function mode) - (indirect-function major-mode)) - (funcall mode)))) + "-mode")))) + (set-auto-mode-0 mode t))) ('eval (pcase val (`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook))) -- 2.39.5