(update-autoloads-from-directory): Get absolute file names from

directory-files, and expand generated-autoload-file.  Subdirs happy now.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 4614a5c42cbf3a1f0213ec50e96dfbb7fa30eb7c..a4289b6800df014924de4d9bfe985eaa9507c9be 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,6 +1,6 @@
 ;;; autoload.el --- maintain autoloads in loaddefs.el.
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.ai.mit.edu>
 ;; Keywords: maint
@@ -377,11 +377,11 @@ Update loaddefs.el with all the current autoloads from DIR, and no old ones.
 This uses `update-file-autoloads' (which see) do its work."
   (interactive "DUpdate autoloads from directory: ")
   (setq dir (expand-file-name dir))
-  (let ((files (directory-files dir nil "^[^=].*\\.el$")))
+  (let ((files (directory-files dir t "^[^=].*\\.el$")))
     (save-excursion
       (set-buffer (find-file-noselect
                   (if (file-exists-p generated-autoload-file)
-                      generated-autoload-file
+                      (expand-file-name generated-autoload-file)
                     (expand-file-name generated-autoload-file
                                       dir))))
       (save-excursion