[Emacs-diffs] /srv/bzr/emacs/trunk r112555: Use generated-autoload-load-name for cus-load.el.

[Glenn Morris]

------------------------------------------------------------
revno: 112555
fixes bug: http://debbugs.gnu.org/5277
author: Kevin Ryde <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-11 16:52:27 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/cus-dep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-11 23:41:52 +0000
+++ b/lisp/ChangeLog    2013-05-11 23:52:27 +0000
@@ -1,3 +1,10 @@
+2013-05-11  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dos-vars.el, emacs-lisp/cl-indent.el, emulation/tpu-extras.el:

=== modified file 'lisp/cus-dep.el'
--- a/lisp/cus-dep.el   2013-01-01 09:11:05 +0000
+++ b/lisp/cus-dep.el   2013-05-11 23:52:27 +0000
@@ -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 @@
                         (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