Mercurial > emacs

changeset 18059:fef9a6fc0655

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(custom-load-symbol): Simplify previous change.
author Richard M. Stallman <rms@gnu.org>
date Sat, 31 May 1997 02:47:47 +0000
parents 6dde3604dce4
children 640305a5c871
files lisp/cus-edit.el
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)