diff options
| author | Kevin Ryde <user42@zip.com.au> | 2013-05-11 16:52:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-11 16:52:27 -0700 |
| commit | e065ba740b33323a25b21be5738f6a7f1fa89a3f (patch) | |
| tree | 855c95f179802505d8da277df3cecbb2fb328bb8 | |
| parent | 36f84c3728a7c47e438eaf1e79ec1b780412631c (diff) | |
| download | emacs-e065ba740b33323a25b21be5738f6a7f1fa89a3f.tar.gz | |
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
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/cus-dep.el | 7 |
2 files changed, 12 insertions, 2 deletions
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 |