master ec574a7: Fix evaluation order for hack-local-variables

[Lars Ingebrigtsen]

branch: master
commit ec574a72f7198d9793b466f33382fff397ac4ce1
Author: Tom Gillespie <tgbugs@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix evaluation order for hack-local-variables
    
    * lisp/files.el (hack-local-variables): Fix the ordering which
    local variables are evaluated by `hack-local-variables' so that
    prop-line local variables are evaluated first. There is a hidden
    nreverse lurking in `hack-local-variables-apply' which means that
    the prop line variables must come second in order to be evaluated
    before the end of file variables.
---
 lisp/files.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 47c5fc1..60f7266 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3771,8 +3771,8 @@ 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-prop-line)
-                            (hack-local-variables--find-variables))))
+      (let ((result (append (hack-local-variables--find-variables)
+                            (hack-local-variables-prop-line))))
         (if (and enable-local-variables
                  (not (inhibit-local-variables-p)))
             (progn