* lisp/files.el (hack-local-variables): Don't burp when files-x isn't loaded

diff --git a/lisp/files.el b/lisp/files.el
index c05d70a00ecb1568d5d3a60f6478310ed0df6f1e..518394fdcd7130a279e7407bc8a8696372f2714c 100644 (file)
--- 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