From 85b78d5b5ae442643bf4ae1fe09e83498f4826e8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 31 May 1997 02:47:47 +0000 Subject: (custom-load-symbol): Simplify previous change. --- lisp/cus-edit.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lisp/cus-edit.el') 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) -- cgit v1.2.1