branch: master
commit abe89142dafb7c5073848b912daecf08cbb7dd13
Author: Artur Malabarba <bruce.connor...@gmail.com>
Commit: Artur Malabarba <bruce.connor...@gmail.com>
Fix failed autoloads because of not-loaded requires
---
names.el | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/names.el b/names.el
index 33f41a2..189b057 100644
--- a/names.el
+++ b/names.el
@@ -444,8 +444,15 @@ See `define-namespace' for more information."
(push key-and-args names--keywords))
;; First have to populate the bound and fbound lists. So we read
- ;; the entire form (without evaluating it).
- (mapc 'names-convert-form body)
+ ;; the entire form (without return it).
+ (if names--inside-make-autoload
+ ;; Dependencies haven't been loaded during autoload
+ ;; generation, so we better ignore errors here. Ideally we
+ ;; would only go through the forms marked for autoloading,
+ ;; but then we wouldn't know what symbols are var/function
+ ;; names.
+ (mapc (lambda (form) (ignore-errors (names-convert-form form)))
body)
+ (mapc #'names-convert-form body))
(setq names--current-run (1+ names--current-run))
;; Then we go back and actually namespace the entire form, which
