# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1036327068 0
# Node ID c102d9848214680eac03d7e48d5d2dd05b753302
# Parent  2c6154347319d5165f4ad9b631572f2b7baa0bad
(generate-file-autoloads, update-file-autoloads): Strip .gz extensions.
(update-autoloads-from-directories): Also consider compressed files.

diff -r 2c6154347319 -r c102d9848214 lisp/emacs-lisp/autoload.el
--- a/lisp/emacs-lisp/autoload.el	Sun Nov 03 12:01:33 2002 +0000
+++ b/lisp/emacs-lisp/autoload.el	Sun Nov 03 12:37:48 2002 +0000
@@ -257,7 +257,7 @@
   (let ((outbuf (current-buffer))
 	(autoloads-done '())
 	(load-name (let ((name (file-name-nondirectory file)))
-		     (if (string-match "\\.elc?$" name)
+		     (if (string-match "\\.elc?\\(\\.\\|$\\)" name)
 			 (substring name 0 (match-beginning 0))
 		       name)))
 	(print-length nil)
@@ -360,7 +360,7 @@
 Return FILE if there was no autoload cookie in it."
   (interactive "fUpdate autoloads for file: ")
   (let ((load-name (let ((name (file-name-nondirectory file)))
-		     (if (string-match "\\.elc?$" name)
+		     (if (string-match "\\.elc?\\(\\.\\|$\\)" name)
 			 (substring name 0 (match-beginning 0))
 		       name)))
 	(found nil)
@@ -480,11 +480,14 @@
 Update loaddefs.el with all the current autoloads from DIRS, and no old ones.
 This uses `update-file-autoloads' (which see) do its work."
   (interactive "DUpdate autoloads from directory: ")
-  (let* ((files (apply 'nconc
+  (let* ((files-re (let ((tmp nil))
+		     (dolist (suf load-suffixes
+				  (concat "^[^=.].*" (regexp-opt tmp t) "\\'"))
+		       (unless (string-match "\\.elc" suf) (push suf tmp)))))
+	 (files (apply 'nconc
 		       (mapcar (lambda (dir)
 				 (directory-files (expand-file-name dir)
-						  ;; FIXME: add .gz etc...
-						  t "^[^=.].*\\.el\\'"))
+						  t files-re))
 			       dirs)))
 	 (this-time (current-time))
 	 (no-autoloads nil)		;files with no autoload cookies.