From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 17 Aug 2003 00:17:16 +0000 (+0000)
Subject: (custom-load-symbol): Load cus-load and cus-start first.
X-Git-Tag: ttn-vms-21-2-B4~9097
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8c78057ff55ebfde9531c2d70eaf575e1009227;p=emacs.git

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

diff --git a/lisp/custom.el b/lisp/custom.el
index bcec5904fd8..640c22002f7 100644
--- 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.