mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

(custom-load-symbol): Don't always load locate-library.

Browse Source
This commit is contained in:
Richard M. Stallman 2001-11-27 05:26:27 +00:00
parent 805e9a057e
commit c6aedc9284
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/ChangeLog
View File

@ -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

20
lisp/cus-edit.el
View File

@ -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)