[Emacs-diffs] master 64f95e4: * lisp/files.el (hack-local-variables): Don't burp when files-x isn't loaded

[Stefan Monnier]

branch: master
commit 64f95e4011242110fb51ae52d3c19a70000de1e6
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/files.el (hack-local-variables): Don't burp when files-x isn't loaded
---
 lisp/files.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/files.el b/lisp/files.el
index c05d70a..518394f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3590,7 +3590,9 @@ local variables, but directory-local variables may still 
be applied."
        result)
     (unless (eq handle-mode t)
       (setq file-local-variables-alist nil)
-      (when (file-remote-p default-directory)
+      (when (and (file-remote-p default-directory)
+                 (fboundp 'hack-connection-local-variables)
+                 (fboundp 'connection-local-criteria-for-default-directory))
         (with-demoted-errors "Connection-local variables error: %s"
          ;; Note this is a no-op if enable-local-variables is nil.
          (hack-connection-local-variables