/[emacs]/emacs/lisp/cus-edit.el
ViewVC logotype

Diff of /emacs/lisp/cus-edit.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.137 by abraham, Thu Nov 8 09:57:20 2001 UTC revision 1.138 by rms, Tue Nov 27 05:25:55 2001 UTC
# Line 1832  and `face'." Line 1832  and `face'."
1832                ((and (boundp 'preloaded-file-list)                ((and (boundp 'preloaded-file-list)
1833                      (member load preloaded-file-list)))                      (member load preloaded-file-list)))
1834                ((assoc load load-history))                ((assoc load load-history))
1835                ((assoc (locate-library load) load-history))                ;; This was just (assoc (locate-library load) load-history)
1836                  ;; but has been optimized not to load locate-library
1837                  ;; if not necessary.
1838                  ((let (found (regexp (regexp-quote load)))
1839                     (dolist (loaded load-history)
1840                       (and (string-match regexp (car loaded))
1841                            (eq (locate-library load) (car loaded))
1842                            (setq found t)))
1843                     found))
1844                  ;; Without this, we would load cus-edit recursively.
1845                  ;; We are still loading it when we call this,
1846                  ;; and it is not in load-history yet.
1847                  ((equal load "cus-edit"))
1848                (t                (t
1849                 (condition-case nil                 (condition-case nil
1850                     ;; Without this, we would load cus-edit recursively.                     (load-library load)
                    ;; 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))  
1851                   (error nil))))))))                   (error nil))))))))
1852    
1853  (defun custom-load-widget (widget)  (defun custom-load-widget (widget)

Legend:
Removed from v.1.137  
changed lines
  Added in v.1.138

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26