[Emacs-diffs] Changes to emacs/lisp/cus-edit.el

[Richard M. Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.152 emacs/lisp/cus-edit.el:1.153
*** emacs/lisp/cus-edit.el:1.152        Fri Apr 26 23:14:21 2002
--- emacs/lisp/cus-edit.el      Sat Apr 27 23:24:20 2002
***************
*** 1836,1880 ****
          (t
           (funcall show widget value)))))
  
- (defvar custom-load-recursion nil
-   "Hack to avoid recursive dependencies.")
- 
- ;;;###autoload
- (defun custom-load-symbol (symbol)
-   "Load all dependencies for SYMBOL."
-   (unless custom-load-recursion
-     (let ((custom-load-recursion t)
-         (loads (get symbol 'custom-loads))
-         load)
-       (while loads
-       (setq load (car loads)
-             loads (cdr loads))
-       (cond ((symbolp load)
-              (condition-case nil
-                  (require load)
-                (error nil)))
-             ;; Don't reload a file already loaded.
-             ((and (boundp 'preloaded-file-list)
-                   (member load preloaded-file-list)))
-             ((assoc load load-history))
-             ;; This was just (assoc (locate-library load) load-history)
-             ;; but has been optimized not to load locate-library
-             ;; if not necessary.
-             ((let (found (regexp (regexp-quote load)))
-                (dolist (loaded load-history)
-                  (and (string-match regexp (car loaded))
-                       (eq (locate-library load) (car loaded))
-                       (setq found t)))
-                found))
-             ;; 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.
-             ((equal load "cus-edit"))
-             (t
-              (condition-case nil
-                  (load-library load)
-                (error nil))))))))
- 
  (defun custom-load-widget (widget)
    "Load all dependencies for WIDGET."
    (custom-load-symbol (widget-value widget)))
--- 1836,1841 ----