From 64f95e4011242110fb51ae52d3c19a70000de1e6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 5 May 2019 08:57:04 -0400 Subject: [PATCH] * 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 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 -- 2.39.5