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

(cherry picked from commit e9e7e3908ab5db1b8f097d47f763309cc3814e91)

diff --git a/lisp/files.el b/lisp/files.el
index 1fca39f7b70be60e055e568cf3b0d50284fd5934..113da6b6be317a6dce5a9dd87acb1bbad8e47132 100644 (file)
--- 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)