From 79aca35c1f0b77d1c109e3b5526400d92f42a2aa Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 10 Dec 2023 22:05:09 +0800 Subject: [PATCH] * lisp/files-x.el (connection-local-value): Fix Dired crash. --- lisp/files-x.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/files-x.el b/lisp/files-x.el index 467981f3f8f..96d49427c81 100644 --- a/lisp/files-x.el +++ b/lisp/files-x.el @@ -935,8 +935,13 @@ value is the default binding of the variable." (unless (symbolp variable) (signal 'wrong-type-argument (list 'symbolp variable))) `(let (connection-local-variables-alist file-local-variables-alist) - (hack-connection-local-variables - (connection-local-criteria-for-default-directory ,application)) + ;; This is a macro, so whether it is autoloaded doesn't influence + ;; whether its callers will induce the loading of files-x.el. + ;; + ;; Verify that h-c-l-v is autoloaded before calling it. + (when (fboundp 'hack-connection-local-variables) + (hack-connection-local-variables + (connection-local-criteria-for-default-directory ,application))) (if-let ((result (assq ',variable connection-local-variables-alist))) (cdr result) ,variable))) -- 2.39.2