Fix major-mode setting regression when there's a mode: cookie

* lisp/files.el (hack-local-variables): Fix regression in setting
the major mode when there are mode: cookies in the file (bug#54993).

Do not merge to master.

diff --git a/lisp/files.el b/lisp/files.el
index d8e7989672ad17209cd114ff28cbb17e07812b83..30e8da4da37c3d5bff60c153303c1d9877b06cf8 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3887,7 +3887,7 @@ inhibited."
       (with-demoted-errors "Directory-local variables error: %s"
        ;; Note this is a no-op if enable-local-variables is nil.
        (hack-dir-local-variables))
-      (let ((result (append (hack-local-variables--find-variables)
+      (let ((result (append (hack-local-variables--find-variables handle-mode)
                             (hack-local-variables-prop-line))))
         (if (and enable-local-variables
                  (not (inhibit-local-variables-p)))