From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 5 May 2019 12:57:04 +0000 (-0400)
Subject: * lisp/files.el (hack-local-variables): Don't burp when files-x isn't loaded
X-Git-Tag: emacs-27.0.90~2981
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64f95e4011242110fb51ae52d3c19a70000de1e6;p=emacs.git

* 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 c05d70a00ec..518394fdcd7 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