Use generated-autoload-load-name for cus-load.el.

[gnu-emacs] / lisp / cus-dep.el

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 60b427344ea05df279513435f7b7de7688e63fb1..099998bf9892e7fd8fe3a6524207e834986ccd61 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -36,7 +36,7 @@
 ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)"
   "Regexp matching file names not to scan for `custom-make-dependencies'.")
 
-(autoload 'autoload-rubric "autoload")
+(require 'autoload)
 
 (defun custom-make-dependencies ()
   "Batch function to extract custom dependencies from .el files.
@@ -60,10 +60,13 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                         (string-match preloaded file)
                         (not (file-exists-p file)))
               (erase-buffer)
+              (kill-all-local-variables)
               (insert-file-contents file)
+              (hack-local-variables)
               (goto-char (point-min))
               (string-match "\\`\\(.*\\)\\.el\\'" file)
-              (let ((name (file-name-nondirectory (match-string 1 file)))
+              (let ((name (or generated-autoload-load-name ; see bug#5277
+                              (file-name-nondirectory (match-string 1 file))))
                     (load-file-name file))
                 (if (save-excursion
                       (re-search-forward