From: Kevin Ryde <user42@zip.com.au>
Date: Sat, 11 May 2013 23:52:27 +0000 (-0700)
Subject: Use generated-autoload-load-name for cus-load.el.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~113
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e065ba740b33323a25b21be5738f6a7f1fa89a3f;p=emacs.git

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

* lisp/cus-dep.el (custom-make-dependencies):
Use generated-autoload-load-name for the sake of files such
such cedet/semantic/bovine/c.el, where the base file name
is not in load-path.

Fixes: debbugs:5277
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa2e0f2a055..3947bdcdf12 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-11  Kevin Ryde  <user42@zip.com.au>
+
+	* cus-dep.el (custom-make-dependencies):
+	Use generated-autoload-load-name for the sake of files such
+	such cedet/semantic/bovine/c.el, where the base file name
+	is not in load-path.  (Bug#5277)
+
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* dos-vars.el, emacs-lisp/cl-indent.el, emulation/tpu-extras.el:
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 60b427344ea..099998bf989 100644
--- 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