emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-28 4684b8e62f: Fix major-mode setting regression when there's a mo


From: Lars Ingebrigtsen
Subject: emacs-28 4684b8e62f: Fix major-mode setting regression when there's a mode: cookie
Date: Mon, 18 Apr 2022 04:37:36 -0400 (EDT)

branch: emacs-28
commit 4684b8e62f882b2a0f29d89a49bd5da8fad1218f
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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.
---
 lisp/files.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/files.el b/lisp/files.el
index d8e7989672..30e8da4da3 100644
--- 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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]