From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 13 Aug 2024 02:27:08 +0000 (+0300)
Subject: ; * lisp/files.el (require-with-check): Fix last change.
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~567
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9e7e3908ab5db1b8f097d47f763309cc3814e91;p=emacs.git

; * lisp/files.el (require-with-check): Fix last change.
---

diff --git a/lisp/files.el b/lisp/files.el
index dc796fffaa1..eadb4a9d0b1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1275,7 +1275,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)