diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 20 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5838b7c244e..6d25f62ace2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2001-11-27 Richard M. Stallman <rms@gnu.org> + + * cus-edit.el (custom-load-symbol): Don't always load locate-library. + +2001-11-26 Richard M. Stallman <rms@gnu.org> + + * wid-edit.el (widget-toggle-value-create): On graphic terminal, + if :on-glyph or :off-glyph is a list, eval it and store it back. + (checkbox): Quote the values for :on-glyph and :off-glyph. + + * cus-start.el (recursive-load-depth-limit): Delete item. + 2001-11-26 Sam Steingold <sds@gnu.org> * progmodes/cc-mode.el (c-submit-bug-report): Make sure that the diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 65aa085c0ef..2f037bfe45e 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1832,14 +1832,22 @@ and `face'." ((and (boundp 'preloaded-file-list) (member load preloaded-file-list))) ((assoc load load-history)) - ((assoc (locate-library 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 - ;; 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)) + (load-library load) (error nil)))))))) (defun custom-load-widget (widget) |