[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 e9e7e3908ab: ; * lisp/files.el (require-with-check): Fix last c
From: |
Eli Zaretskii |
Subject: |
emacs-30 e9e7e3908ab: ; * lisp/files.el (require-with-check): Fix last change. |
Date: |
Mon, 12 Aug 2024 22:28:10 -0400 (EDT) |
branch: emacs-30
commit e9e7e3908ab5db1b8f097d47f763309cc3814e91
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; * lisp/files.el (require-with-check): Fix last change.
---
lisp/files.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-30 e9e7e3908ab: ; * lisp/files.el (require-with-check): Fix last change.,
Eli Zaretskii <=