projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b585826
)
; * lisp/files.el (require-with-check): Fix last change.
author
Eli Zaretskii
<eliz@gnu.org>
Tue, 13 Aug 2024 02:27:08 +0000
(
05:27
+0300)
committer
Eli Zaretskii
<eliz@gnu.org>
Tue, 13 Aug 2024 02:27:08 +0000
(
05:27
+0300)
lisp/files.el
patch
|
blob
|
history
diff --git
a/lisp/files.el
b/lisp/files.el
index dc796fffaa1685d0b9529e9863a551e749473ce7..eadb4a9d0b1964481505a7edbe339280d896d15c 100644
(file)
--- 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)