On Wed, Jul 20, 2016 at 10:05 PM, Stefan Monnier <
monnier@iro.umontreal.ca> wrote:
>> Replacing this function in package.el allows for correct generation of the
>> <package>-autoloads.el file for packages that have .el files in multiple
>> subdirectories.
>
> FWIW, I think this will break the dash package which includes
> a dev/ert.el file with autoload cookies in it and those shouldn't be
> placed into the dash-autoloads.el file.
>
>
> Stefan
>
>
> PS: Please send it as a patch so we can see what changed without having
> to try and guess.
Here is the patch. -- Bob
*** package-orig.el 2016-05-17 12:16:33.000000000 -0400
--- package.el 2016-06-15 14:43:46.000000000 -0400
***************
*** 916,928 ****
(backup-inhibited t)
(version-control 'never))
(package-autoload-ensure-default-file generated-autoload-file)
! (update-directory-autoloads pkg-dir)
(let ((buf (find-buffer-visiting generated-autoload-file)))
(when buf (kill-buffer buf)))
auto-name))
(defun package--make-autoloads-and-stuff (pkg-desc pkg-dir)
"Generate autoloads, description file, etc.. for PKG-DESC installed at PKG-DIR."
(package-generate-autoloads (package-desc-name pkg-desc) pkg-dir)
(let ((desc-file (expand-file-name (package--description-file pkg-dir)
pkg-dir)))
--- 913,929 ----
(backup-inhibited t)
(version-control 'never))
(package-autoload-ensure-default-file generated-autoload-file)
! (apply #'update-directory-autoloads pkg-dir
! (delq nil (mapcar (lambda (f) (and (file-directory-p f)
! (not (file-symlink-p f))
! f))
! (directory-files pkg-dir t "[a-zA-Z].*" nil))))
(let ((buf (find-buffer-visiting generated-autoload-file)))
(when buf (kill-buffer buf)))
auto-name))
(defun package--make-autoloads-and-stuff (pkg-desc pkg-dir)
"Generate autoloads, description file, etc.. for PKG-DESC installed at PKG-DIR."
(package-generate-autoloads (package-desc-name pkg-desc) pkg-dir)
(let ((desc-file (expand-file-name (package--description-file pkg-dir)
pkg-dir)))