* lisp/files.el (hack-local-variables): Fix regression with multiple
mode: entries in the prop line.
Do not merge to master.
;; 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