- (unless custom-load-recursion
- (let ((custom-load-recursion t))
- (dolist (load (get symbol 'custom-loads))
- (cond
- ((symbolp load)
- ;; (condition-case nil (require load) (error nil))
- (condition-case alpha
- (unless (featurep load)
- (require load)
- (push (list symbol load) cus-test-deps-required))
- (error
- (push (list symbol load alpha) cus-test-deps-errors)
- (message "Require problem: %s %s %s" symbol load alpha))))
- ((equal load "loaddefs")
- (push
- (message "Symbol %s has loaddefs as custom dependency" symbol)
- cus-test-deps-errors))
- ;; This is subsumed by the test below, but it's much
- ;; faster.
- ((assoc load load-history))
- ;; This was just
- ;; (assoc (locate-library load) load-history)
- ;; but has been optimized not to load locate-library
- ;; if not necessary.
- ((let ((regexp (concat "\\(\\`\\|/\\)" (regexp-quote load)
- "\\(\\'\\|\\.\\)"))
- (found nil))
- (dolist (loaded load-history)
- (and (stringp (car loaded))
- (string-match regexp (car loaded))
- (setq found t)))
- found))
- ;; Without this, we would load cus-edit recursively.
- ;; We are still loading it when we call this,
- ;; and it is not in load-history yet.
- ((equal load "cus-edit"))
- (t
- ;; (condition-case nil (load load) (error nil))
- (condition-case alpha
- (progn
- (load load)
- (push (list symbol load) cus-test-deps-loaded))
- (error
- (push (list symbol load alpha) cus-test-deps-errors)
- (message "Load Problem: %s %s %s" symbol load alpha))))
- ))))))
+ (let ((custom-load-recursion t))
+ (dolist (load (get symbol 'custom-loads))
+ (cond
+ ((symbolp load)
+ ;; (condition-case nil (require load) (error nil))
+ (condition-case alpha
+ (unless (featurep load)
+ (require load)
+ (push (list symbol load) cus-test-deps-required))
+ (error
+ (push (list symbol load alpha) cus-test-deps-errors)
+ (message "Require problem: %s %s %s" symbol load alpha))))
+ ((equal load "loaddefs")
+ (push
+ (message "Symbol %s has loaddefs as custom dependency" symbol)
+ cus-test-deps-errors))
+ ;; This is subsumed by the test below, but it's much
+ ;; faster.
+ ((assoc load load-history))
+ ;; This was just
+ ;; (assoc (locate-library load) load-history)
+ ;; but has been optimized not to load locate-library
+ ;; if not necessary.
+ ((let ((regexp (concat "\\(\\`\\|/\\)" (regexp-quote load)
+ "\\(\\'\\|\\.\\)"))
+ (found nil))
+ (dolist (loaded load-history)
+ (and (stringp (car loaded))
+ (string-match regexp (car loaded))
+ (setq found t)))
+ found))
+ ;; Without this, we would load cus-edit recursively.
+ ;; We are still loading it when we call this,
+ ;; and it is not in load-history yet.
+ ((equal load "cus-edit"))
+ ;; This would ignore load problems with files in
+ ;; lisp/term/
+ ;; ((locate-library (concat term-file-prefix load)))
+ (t
+ ;; (condition-case nil (load load) (error nil))
+ (condition-case alpha
+ (progn
+ (load load)
+ (push (list symbol load) cus-test-deps-loaded))
+ (error
+ (push (list symbol load alpha) cus-test-deps-errors)
+ (message "Load Problem: %s %s %s" symbol load alpha))))
+ )))))