[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 35224ac: * lisp/help-fns.el (help--load-prefixes):
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 35224ac: * lisp/help-fns.el (help--load-prefixes): Demote errors from files. |
Date: |
Tue, 8 Jan 2019 11:28:15 -0500 (EST) |
branch: master
commit 35224ac3aebd4c55a4cdccea908a62f92aaebf25
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/help-fns.el (help--load-prefixes): Demote errors from files.
---
lisp/help-fns.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 04bb314..b4e93d3 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -68,6 +68,9 @@ The functions will receive the function name as argument.")
(defun help--loaded-p (file)
"Try and figure out if FILE has already been loaded."
+ ;; FIXME: this regexp business is not good enough: for file
+ ;; `toto', it will say `toto' is loaded when in reality it was
+ ;; just cedet/semantic/toto that has been loaded.
(or (let ((feature (intern-soft file)))
(and feature (featurep feature)))
(let* ((re (load-history-regexp file))
@@ -83,11 +86,9 @@ The functions will receive the function name as argument.")
(dolist (file files)
;; FIXME: Should we scan help-definition-prefixes to remove
;; other prefixes of the same file?
- ;; FIXME: this regexp business is not good enough: for file
- ;; `toto', it will say `toto' is loaded when in reality it was
- ;; just cedet/semantic/toto that has been loaded.
(unless (help--loaded-p file)
- (load file 'noerror 'nomessage)))))
+ (with-demoted-errors "while loading: %S"
+ (load file 'noerror 'nomessage))))))
(defun help--symbol-completion-table (string pred action)
(let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 35224ac: * lisp/help-fns.el (help--load-prefixes): Demote errors from files.,
Stefan Monnier <=