Commit 8ba148c7 authored by Richard M. Stallman's avatar Richard M. Stallman

(custom-load-symbol): Moved to custom.el.

(custom-load-recursion): Likewise.
parent 8f772dfd
......@@ -57,6 +57,9 @@ Other features we would like:
* Make desktop.el save the "frame configuration" of Emacs (in some
useful sense).
* Give desktop.el a feature to switch between different named
desktops.
* Replace finder.el with something that generates an Info file
which gives the same information through a menu structure. [Dave
Love started on this.]
......
......@@ -5,6 +5,12 @@
2002-04-27 Richard M. Stallman <rms@gnu.org>
* custom.el (custom-load-symbol): Moved from cus-edit.el.
(custom-load-recursion): Likewise.
* cus-edit.el (custom-load-symbol): Moved to custom.el.
(custom-load-recursion): Likewise.
* progmodes/ada-xref.el (ada-add-ada-menu): Menu pseudo-keys
generated by easymenu are now lowercase.
......@@ -52,7 +58,12 @@
Put a `read-face-name' prop on the entire line.
(describe-face): Handle multiple faces via read-face-name.
* textmodes/tex-mode.el (tex-start-tex): Fix previous change.
* textmodes/tex-mode.el (tex-start-options): New variable.
(tex-start-commands): New variable.
(tex-start-options-string): Variable deleted.
(tex-start-tex): Use tex-start-options and tex-start-commands,
not tex-start-options-string.
(tex-command): Doc fix.
2002-04-26 Sam Steingold <sds@gnu.org>
......
......@@ -1836,45 +1836,6 @@ and `face'."
(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)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment