(custom-load-symbol): Simplify previous change.

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 25843805497..e15a39a015c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1306,10 +1306,15 @@ Change the state of this item."
                (condition-case nil
                    (require load)
                  (error nil)))
-              ((assoc load load-history))
+              ;; Don't reload a file already loaded.
+              ((assoc (locate-library load) load-history))
               (t
                (condition-case nil
-                   (load-library load)
+                   ;; 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.
+                   (or (equal load "cus-edit")
+                       (load-library load))
                  (error nil))))))))
 
 (defun custom-load-widget (widget)