diff options
author | Eli Zaretskii <eliz@gnu.org> | 2001-07-03 12:39:17 +0000 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2001-07-03 12:39:17 +0000 |
commit | f1c53471a7eda50ac95f3961f57baadcd514e6e0 (patch) | |
tree | 610b5491617c84fdb331616dd190bd5b44d4e64e /lisp | |
parent | 5e67c7844417acc0b717aba56feef0f303c9362a (diff) | |
download | emacs-f1c53471a7eda50ac95f3961f57baadcd514e6e0.tar.gz |
(locate-library): Enable code that looks for compressed
libraries if auto-compression-mode is on.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/help.el | 28 |
2 files changed, 18 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e7b5c487834..e1259af3479 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-07-03 Eli Zaretskii <eliz@is.elta.co.il> + + * help.el (locate-library): Enable code that looks for compressed + libraries if auto-compression-mode is on. + 2001-07-02 Stefan Monnier <monnier@cs.yale.edu> * info.el (Info-clone-buffer-hook): Really unconditionally copy marker. diff --git a/lisp/help.el b/lisp/help.el index 945b168f881..c0447dcaedd 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1028,21 +1028,19 @@ and the file name is displayed in the echo area." (if nosuffix '("") '(".elc" ".el" "") -;;; load doesn't handle this yet. -;;; (let ((basic '(".elc" ".el" "")) -;;; (compressed '(".Z" ".gz" ""))) -;;; ;; If autocompression mode is on, -;;; ;; consider all combinations of library suffixes -;;; ;; and compression suffixes. -;;; (if (rassq 'jka-compr-handler file-name-handler-alist) -;;; (apply 'nconc -;;; (mapcar (lambda (compelt) -;;; (mapcar (lambda (baselt) -;;; (concat baselt compelt)) -;;; basic)) -;;; compressed)) -;;; basic)) - ))) + (let ((basic '(".elc" ".el" "")) + (compressed '(".Z" ".gz" ""))) + ;; If autocompression mode is on, + ;; consider all combinations of library suffixes + ;; and compression suffixes. + (if (rassq 'jka-compr-handler file-name-handler-alist) + (apply 'nconc + (mapcar (lambda (compelt) + (mapcar (lambda (baselt) + (concat baselt compelt)) + basic)) + compressed)) + basic))))) (or path load-path))) (and interactive-call (if result |