From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Robert Weiner Newsgroups: gmane.emacs.bugs Subject: bug#23607: Please apply this patched function to package.el in Emacs 25. Date: Thu, 21 Jul 2016 11:47:49 -0400 Message-ID: References: Reply-To: rswgnu@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a113ddff22f56e80538273f33 X-Trace: ger.gmane.org 1469116175 31484 80.91.229.3 (21 Jul 2016 15:49:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 21 Jul 2016 15:49:35 +0000 (UTC) Cc: Tom Tromey , 23607@debbugs.gnu.org, Daniel Hackney To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 21 17:49:24 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bQGDz-0002AR-Da for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Jul 2016 17:49:23 +0200 Original-Received: from localhost ([::1]:41627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQGDy-0007Bq-CZ for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Jul 2016 11:49:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQGDk-00079f-L5 for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 11:49:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQGDe-0006Li-JZ for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 11:49:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQGDe-0006Lc-G9 for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 11:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bQGDe-0002Fw-BY for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Robert Weiner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Jul 2016 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23607 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23607-submit@debbugs.gnu.org id=B23607.14691161158631 (code B ref 23607); Thu, 21 Jul 2016 15:49:02 +0000 Original-Received: (at 23607) by debbugs.gnu.org; 21 Jul 2016 15:48:35 +0000 Original-Received: from localhost ([127.0.0.1]:60582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQGDC-0002F8-TQ for submit@debbugs.gnu.org; Thu, 21 Jul 2016 11:48:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQGD8-0002Eu-Vb for 23607@debbugs.gnu.org; Thu, 21 Jul 2016 11:48:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQGCy-0006Cz-Sy for 23607@debbugs.gnu.org; Thu, 21 Jul 2016 11:48:25 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQGCy-0006Cn-Pq for 23607@debbugs.gnu.org; Thu, 21 Jul 2016 11:48:20 -0400 Original-Received: from mail-oi0-f42.google.com ([209.85.218.42]:34563) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bQGCx-0002su-7Q for 23607@debbugs.gnu.org; Thu, 21 Jul 2016 11:48:19 -0400 Original-Received: by mail-oi0-f42.google.com with SMTP id l65so123380882oib.1 for <23607@debbugs.gnu.org>; Thu, 21 Jul 2016 08:48:19 -0700 (PDT) X-Gm-Message-State: ALyK8tIXafKen9WGlmhLT9KTmNFrkKjzDMztHOHMVo9md+7HKsJmlsofpjyJhJbuVRYXkXt6vc6A7vRMcM9fhw== X-Received: by 10.202.192.214 with SMTP id q205mr26358792oif.176.1469116098497; Thu, 21 Jul 2016 08:48:18 -0700 (PDT) Original-Received: by 10.202.199.143 with HTTP; Thu, 21 Jul 2016 08:47:49 -0700 (PDT) In-Reply-To: X-Gmail-Original-Message-ID: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:121392 Archived-At: --001a113ddff22f56e80538273f33 Content-Type: text/plain; charset=UTF-8 On Wed, Jul 20, 2016 at 10:05 PM, Stefan Monnier wrote: >> Replacing this function in package.el allows for correct generation of the >> -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))) --001a113ddff22f56e80538273f33 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On Wed, Jul 20, 2016 at 10:05 PM, Stefan Monnier <monnier@iro.umontreal.ca> wro= te:
>> Replacing this function in package.el allows for correct ge= neration 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 de= v/ert.el file with autoload cookies in it and those shouldn't be
>= ; placed into the dash-autoloads.el file.
>
>
> =C2=A0 = =C2=A0 =C2=A0 =C2=A0 Stefan
>
>
> PS: Please send it as a= patch so we can see what changed without having
> to try and guess.<= br>
Here is the patch. =C2=A0-- Bob


*** package-o= rig.el 2016-05-17 12:16:33.000000000 -0400
--- package.el 2016-06-15 14:= 43:46.000000000 -0400
***************
*** 916,928 ****
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(backup-inhibited t)
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(version-control 'never))
=C2=A0 =C2=A0 =C2=A0 = (package-autoload-ensure-default-file generated-autoload-file)
! =C2=A0 = =C2=A0 (update-directory-autoloads pkg-dir)
=C2=A0 =C2=A0 =C2=A0 (let ((= buf (find-buffer-visiting generated-autoload-file)))
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 (when buf (kill-buffer buf)))
=C2=A0 =C2=A0 =C2=A0 auto-name)= )
=C2=A0
=C2=A0 (defun package--make-autoloads-and-stuff (pkg-desc pk= g-dir)
=C2=A0 =C2=A0"Generate autoloads, description file, etc.. fo= r PKG-DESC installed at PKG-DIR."
=C2=A0 =C2=A0 (package-generate-a= utoloads (package-desc-name pkg-desc) pkg-dir)
=C2=A0 =C2=A0 (let ((desc= -file (expand-file-name (package--description-file pkg-dir)
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkg-dir)))
--- 91= 3,929 ----
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(backup-inhibited t)=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(version-control 'never))<= br>=C2=A0 =C2=A0 =C2=A0 (package-autoload-ensure-default-file generated-aut= oload-file)
! =C2=A0 =C2=A0 (apply #'update-directory-autoloads pkg-= dir
! =C2=A0 (delq nil (mapcar (lambda (f) (and (file-directory-p f)
= ! =C2=A0 =C2=A0 =C2=A0(not (file-symlink-p f))
! =C2=A0 =C2=A0 =C2=A0f))=
! =C2=A0 =C2=A0 (directory-files pkg-dir t "[a-zA-Z].*" nil))= ))
=C2=A0 =C2=A0 =C2=A0 (let ((buf (find-buffer-visiting generated-autol= oad-file)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (when buf (kill-buffer buf)))=C2=A0 =C2=A0 =C2=A0 auto-name))
=C2=A0
=C2=A0 (defun package--make-= autoloads-and-stuff (pkg-desc pkg-dir)
=C2=A0 =C2=A0"Generate autol= oads, description file, etc.. for PKG-DESC installed at PKG-DIR."
= =C2=A0 =C2=A0 (package-generate-autoloads (package-desc-name pkg-desc) pkg-= dir)
=C2=A0 =C2=A0 (let ((desc-file (expand-file-name (package--descript= ion-file pkg-dir)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0pkg-dir)))


--001a113ddff22f56e80538273f33--