1 files changed, 17 insertions, 15 deletions
diff --git a/lisp/help.el b/lisp/help.el
index cc322482f14..8fdcc7c8d48 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -707,8 +707,7 @@ is used instead of `load-path'."
  (interactive (list (read-string "Locate library: ")
                     nil nil
                     t))
-  (let (result
+  (let (result)
-        (jka-compr-inhibit t))
    (catch 'answer
      (mapcar
       (lambda (dir)
@@ -722,19 +721,22 @@ is used instead of `load-path'."
                     (throw 'answer try)))))
          (if nosuffix
              '("")
-            (let ((basic '(".elc" ".el" ""))
+            '(".elc" ".el" "")
-                  (compressed '(".Z" ".gz" "")))
+;;; load doesn't handle this yet.
-              ;; If autocompression mode is on,
+;;;         (let ((basic '(".elc" ".el" ""))
-              ;; consider all combinations of library suffixes
+;;;               (compressed '(".Z" ".gz" "")))
-              ;; and compression suffixes.
+;;;           ;; If autocompression mode is on,
-              (if (rassq 'jka-compr-handler file-name-handler-alist)
+;;;           ;; consider all combinations of library suffixes
-                  (apply 'nconc
+;;;           ;; and compression suffixes.
-                         (mapcar (lambda (compelt)
+;;;           (if (rassq 'jka-compr-handler file-name-handler-alist)
-                                   (mapcar (lambda (baselt)
+;;;               (apply 'nconc
-                                             (concat baselt compelt))
+;;;                      (mapcar (lambda (compelt)
-                                           basic))
+;;;                                (mapcar (lambda (baselt)
-                                 compressed))
+;;;                                          (concat baselt compelt))
-                basic)))))
+;;;                                        basic))
+;;;                              compressed))
+;;;             basic))
+            )))
       (or path load-path)))
    (and interactive-call
         (if result

diff --git a/lisp/help.el b/lisp/help.el index cc322482f14..8fdcc7c8d48 100644 --- a/lisp/help.el +++ b/lisp/help.el
@@ -707,8 +707,7 @@ is used instead of `load-path'."
707	(interactive (list (read-string "Locate library: ")	707	(interactive (list (read-string "Locate library: ")
708	nil nil	708	nil nil
709	t))	709	t))
710	(let (result	710	(let (result)
711	(jka-compr-inhibit t))
712	(catch 'answer	711	(catch 'answer
713	(mapcar	712	(mapcar
714	(lambda (dir)	713	(lambda (dir)
@@ -722,19 +721,22 @@ is used instead of `load-path'."
722	(throw 'answer try)))))	721	(throw 'answer try)))))
723	(if nosuffix	722	(if nosuffix
724	'("")	723	'("")
725	(let ((basic '(".elc" ".el" ""))	724	'(".elc" ".el" "")
726	(compressed '(".Z" ".gz" "")))	725	;;; load doesn't handle this yet.
727	;; If autocompression mode is on,	726	;;; (let ((basic '(".elc" ".el" ""))
728	;; consider all combinations of library suffixes	727	;;; (compressed '(".Z" ".gz" "")))
729	;; and compression suffixes.	728	;;; ;; If autocompression mode is on,
730	(if (rassq 'jka-compr-handler file-name-handler-alist)	729	;;; ;; consider all combinations of library suffixes
731	(apply 'nconc	730	;;; ;; and compression suffixes.
732	(mapcar (lambda (compelt)	731	;;; (if (rassq 'jka-compr-handler file-name-handler-alist)
733	(mapcar (lambda (baselt)	732	;;; (apply 'nconc
734	(concat baselt compelt))	733	;;; (mapcar (lambda (compelt)
735	basic))	734	;;; (mapcar (lambda (baselt)
736	compressed))	735	;;; (concat baselt compelt))
737	basic)))))	736	;;; basic))
		737	;;; compressed))
		738	;;; basic))
		739	)))
738	(or path load-path)))	740	(or path load-path)))
739	(and interactive-call	741	(and interactive-call
740	(if result	742	(if result