diff options
| author | Richard M. Stallman | 2003-08-17 00:17:16 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2003-08-17 00:17:16 +0000 |
| commit | a8c78057ff55ebfde9531c2d70eaf575e1009227 (patch) | |
| tree | 8a3d69918b9951f306ee574cbbf7b2ba5f270b4d | |
| parent | 6ee55cb13011f821a70b4617557b9d9baf28a28b (diff) | |
| download | emacs-a8c78057ff55ebfde9531c2d70eaf575e1009227.tar.gz emacs-a8c78057ff55ebfde9531c2d70eaf575e1009227.zip | |
(custom-load-symbol): Load cus-load and cus-start first.
| -rw-r--r-- | lisp/custom.el | 8 |
1 files changed, 8 insertions, 0 deletions
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." | |||
| 502 | "Load all dependencies for SYMBOL." | 502 | "Load all dependencies for SYMBOL." |
| 503 | (unless custom-load-recursion | 503 | (unless custom-load-recursion |
| 504 | (let ((custom-load-recursion t)) | 504 | (let ((custom-load-recursion t)) |
| 505 | ;; Load these files if not already done, | ||
| 506 | ;; to make sure we know all the dependencies of SYMBOL. | ||
| 507 | (condition-case nil | ||
| 508 | (require 'cus-load) | ||
| 509 | (error nil)) | ||
| 510 | (condition-case nil | ||
| 511 | (require 'cus-start) | ||
| 512 | (error nil)) | ||
| 505 | (dolist (load (get symbol 'custom-loads)) | 513 | (dolist (load (get symbol 'custom-loads)) |
| 506 | (cond ((symbolp load) (condition-case nil (require load) (error nil))) | 514 | (cond ((symbolp load) (condition-case nil (require load) (error nil))) |
| 507 | ;; This is subsumed by the test below, but it's much faster. | 515 | ;; This is subsumed by the test below, but it's much faster. |