aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2019-05-05 08:57:04 -0400
committerStefan Monnier2019-05-05 08:57:04 -0400
commit64f95e4011242110fb51ae52d3c19a70000de1e6 (patch)
tree80b891fb9bc8611409e7bd28fbd73cc4bd81d247
parent10aa44a1ddef86a6a8e3ac01d339fd8a3872818d (diff)
downloademacs-64f95e4011242110fb51ae52d3c19a70000de1e6.tar.gz
emacs-64f95e4011242110fb51ae52d3c19a70000de1e6.zip
* lisp/files.el (hack-local-variables): Don't burp when files-x isn't loaded
-rw-r--r--lisp/files.el4
1 files changed, 3 insertions, 1 deletions
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."
3590 result) 3590 result)
3591 (unless (eq handle-mode t) 3591 (unless (eq handle-mode t)
3592 (setq file-local-variables-alist nil) 3592 (setq file-local-variables-alist nil)
3593 (when (file-remote-p default-directory) 3593 (when (and (file-remote-p default-directory)
3594 (fboundp 'hack-connection-local-variables)
3595 (fboundp 'connection-local-criteria-for-default-directory))
3594 (with-demoted-errors "Connection-local variables error: %s" 3596 (with-demoted-errors "Connection-local variables error: %s"
3595 ;; Note this is a no-op if enable-local-variables is nil. 3597 ;; Note this is a no-op if enable-local-variables is nil.
3596 (hack-connection-local-variables 3598 (hack-connection-local-variables