# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 865046867 0
# Node ID fef9a6fc0655536fc5f2178c7e2856b9a3069936
# Parent  6dde3604dce4b4aa683121ce8d7f2f9e814fae2a
(custom-load-symbol): Simplify previous change.

diff -r 6dde3604dce4 -r fef9a6fc0655 lisp/cus-edit.el
--- a/lisp/cus-edit.el	Sat May 31 02:45:18 1997 +0000
+++ b/lisp/cus-edit.el	Sat May 31 02:47:47 1997 +0000
@@ -1306,10 +1306,15 @@
 	       (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)