From c8b5999cfd616a26d0981403580985331c1c851c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 13 Aug 2024 05:27:08 +0300 Subject: [PATCH] ; * lisp/files.el (require-with-check): Fix last change. (cherry picked from commit e9e7e3908ab5db1b8f097d47f763309cc3814e91) --- lisp/files.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/files.el b/lisp/files.el index 1fca39f7b70..113da6b6be3 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1287,7 +1287,8 @@ NOERROR is equal to `reload'), or otherwise emit a warning." ((assoc fn load-history) nil) ;We loaded the right file. ((eq noerror 'reload) (load fn nil 'nomessage)) (t (funcall (if noerror #'warn #'error) - "Feature `%S' is now provided by a different file %s" fn))))) + "Feature `%S' is now provided by a different file %s" + feature fn))))) res)) (defun file-remote-p (file &optional identification connected) -- 2.39.2