procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

* lisp/files.el (require-with-check): Improve error messages.

Browse source
This commit is contained in:
Pip Cet 2024-08-15 16:28:07 +00:00
parent 9a04b99b3d
commit 45a78ec6c5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/files.el
View file

@ -1274,9 +1274,17 @@ NOERROR is equal to `reload'), or otherwise emit a warning."
(cond
((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"
feature fn)))))
((and fn (memq feature features))
(funcall (if noerror #'warn #'error)
"Feature `%S' is now provided by a different file %s"
feature fn))
(fn
(funcall (if noerror #'warn #'error)
"Could not load file %s" fn))
(t
(funcall (if noerror #'warn #'error)
"Could not locate file %s in load path"
(or filename (symbol-name feature)))))))
res))
(defun file-remote-p (file &optional identification connected)