(custom-load-symbol): Load cus-load and cus-start first.

diff --git a/lisp/custom.el b/lisp/custom.el
index bcec5904fd804859fa82bf0edc16136b584f566b..640c22002f7e8ccc4d8e2cb28f0607be435f4033 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -502,6 +502,14 @@ LOAD should be either a library file name, or a feature name."
   "Load all dependencies for SYMBOL."
   (unless custom-load-recursion
     (let ((custom-load-recursion t))
+      ;; Load these files if not already done,
+      ;; to make sure we know all the dependencies of SYMBOL.
+      (condition-case nil
+         (require 'cus-load)
+       (error nil))
+      (condition-case nil
+         (require 'cus-start)
+       (error nil))
       (dolist (load (get symbol 'custom-loads))
        (cond ((symbolp load) (condition-case nil (require load) (error nil)))
              ;; This is subsumed by the test below, but it's much faster.