From: Lars Ingebrigtsen Date: Tue, 19 Apr 2022 16:08:20 +0000 (+0200) Subject: Fix regression with multiple mode: entries in the prop line X-Git-Tag: emacs-28.1.90~121 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1030cc1897;p=emacs.git Fix regression with multiple mode: entries in the prop line * lisp/files.el (hack-local-variables): Fix regression with multiple mode: entries in the prop line. Do not merge to master. --- diff --git a/lisp/files.el b/lisp/files.el index 30e8da4da37..b187c0b3a0a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3888,7 +3888,7 @@ inhibited." ;; Note this is a no-op if enable-local-variables is nil. (hack-dir-local-variables)) (let ((result (append (hack-local-variables--find-variables handle-mode) - (hack-local-variables-prop-line)))) + (hack-local-variables-prop-line handle-mode)))) (if (and enable-local-variables (not (inhibit-local-variables-p))) (progn