From unknown Sat Jun 21 05:19:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#23636: Please apply this patched function to package.el in Emacs 25. Resent-From: Robert Weiner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 May 2016 05:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 23636 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Cc: 23636@debbugs.gnu.org X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.146441178613493 (code B ref -1); Sat, 28 May 2016 05:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2016 05:03:06 +0000 Received: from localhost ([127.0.0.1]:43130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b6WOw-0003VY-0o for submit@debbugs.gnu.org; Sat, 28 May 2016 01:03:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b6WOt-0003V4-Vy for submit@debbugs.gnu.org; Sat, 28 May 2016 01:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6WOn-0002WD-MD for submit@debbugs.gnu.org; Sat, 28 May 2016 01:02:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,MISSING_HEADERS,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:41114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6WOn-0002W0-IZ for submit@debbugs.gnu.org; Sat, 28 May 2016 01:02:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6WOl-000306-1h for bug-gnu-emacs@gnu.org; Sat, 28 May 2016 01:02:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6WOi-0002VL-Ob for bug-gnu-emacs@gnu.org; Sat, 28 May 2016 01:02:54 -0400 Received: from mail-oi0-x234.google.com ([2607:f8b0:4003:c06::234]:33037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6WOi-0002V1-IT for bug-gnu-emacs@gnu.org; Sat, 28 May 2016 01:02:52 -0400 Received: by mail-oi0-x234.google.com with SMTP id k23so202923833oih.0 for ; Fri, 27 May 2016 22:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:cc; bh=UEJEP6Ul3RTmPRjmWJDOhcQ1bnpS2DT7qjavoR61NMc=; b=OuXGrArmoYjsJMi3JfHX0Rop/We6+W7fiNN1xZmKQCb9voFdIMEa1wdIzBri/fFqN9 M4LzsL7aFficZYjX0ftb0NL4nGfZdvo7o4XljXbvKYqzBGgNK9IsnXAxFN4KdFumfwCH T3GDYQh5/AHeqmQV9puHgz7INq2ak31aeHLmaGj228puXMUbNZdsSPSsvo2Ms6aPxmg3 YH1P6+mCtM83tyeawkrEtSScfA7PTti0twkKIohB+Ct1Vj60nKGBwH+btVZlLQfG3k6l wQhrsqysoSRfC0u5mCeLI6J4wTtX+VYSMm7fy+dpmITWHcI1oDGh9as6mYLgmHrGHswl AR5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:cc; bh=UEJEP6Ul3RTmPRjmWJDOhcQ1bnpS2DT7qjavoR61NMc=; b=MXrPLG0fbPLYWjgp9nmyzx+/roLSnDnYkhJ8dXW+aqSj4U9+Rg3Fr5FAWvu1eiXbSM hs8wCW9WgClNRSaDo8Vuh9lq5zbjEOVPpd3+LcT0mjVRNNavazp1YgycWXCnR6RRNuT+ fcz90ZHuadEmfMzry5s3aDx5TKU/J/AxfeXWLaRg+FrFj+z7C4nTpNgp6vGKuZNBwHuh D4GLGp0Msgxyi3yPTkESL0AwP94bPD7rKhFZSwwRka/y4fS2FGta2c4F35iveGq3Znte Gu/7dOAZUjdPilbbO/vgdq1M7aGKS4D1rQQjA+NZzGRFvvmEpQ5CmrfulPwbL+Jxr4LH cMJQ== X-Gm-Message-State: ALyK8tLksIGum2DTlh25KT5pb0OdH2YPLtB9ARRTFFpR7OHq6vE+zhT4+sKR5bocN+bkqRIBEgi4Ca0jFzpiTw== X-Received: by 10.157.20.149 with SMTP id d21mr11550988ote.143.1464411772024; Fri, 27 May 2016 22:02:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.205.17 with HTTP; Fri, 27 May 2016 22:02:22 -0700 (PDT) From: Robert Weiner Date: Sat, 28 May 2016 01:02:22 -0400 Message-ID: Content-Type: multipart/alternative; boundary=001a113e22ac79fb380533dfef6e X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) --001a113e22ac79fb380533dfef6e Content-Type: text/plain; charset=UTF-8 Here is the actual patch to go along with my message from 5 days ago which included only the full replacement function. On Mon, May 23, 2016 at 7:11 PM, Robert Weiner 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. The only thing changed is the line with 'apply' in it. It > ignores symlinks to directories in case there are any. It is a simple > change. I hope you like it. > > This is important for larger packages such as my forthcoming Hyperbole > package which includes a 2nd directory of code. > > *** package-orig.el 2016-05-28 00:54:25.000000000 -0400 > --- package.el 2016-05-28 00:54:25.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))) > --- 911,927 ---- > (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))) > *************** > > --001a113e22ac79fb380533dfef6e Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Here is the actual patch to go along with my message from = 5 days ago which included only the full replacement function.

On Mon, May 23, 2016 at 7:1= 1 PM, Robert Weiner <rswgnu@gmail.com> wrote:
Replacing this function in package.el allows for= correct generation of the <package>-autoloads.el file for packages t= hat have .el files in multiple subdirectories.=C2=A0 The only thing changed= is the line with 'apply' in it.=C2=A0 It ignores symlinks to direc= tories in case there are any.=C2=A0 It is a simple change.=C2=A0 I hope you= like it.

This is important for larger packages su= ch as my forthcoming Hyperbole package which includes a 2nd directory of co= de.

*** package-orig.el 2016-05-28 00:54:25.000000000 -0400
--- = package.el 2016-05-28 00:= 54:25.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-contr= ol 'never))
=C2=A0 =C2=A0 =C2=A0 (packa= ge-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-visiti= ng 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
=C2=A0 (defun package--make-autoload= s-and-stuff (pkg-desc pkg-dir)
=C2=A0 =C2= =A0"Generate autoloads, description file, etc.. for PKG-DESC installed= at PKG-DIR."
=C2=A0 =C2=A0 (package-g= enerate-autoloads (package-desc-name pkg-desc) pkg-dir)
=C2=A0 =C2=A0 (let ((desc-file (expand-file-name (package--des= cription-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)))
--- 911,927 ----
=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-en= sure-default-file generated-autoload-file)
= ! =C2=A0 =C2=A0 (apply #'update-directory-autoloads pkg-dir
!=C2=A0 =C2=A0=C2=A0 (delq nil (mapcar (lambda (f) (and (file-directory-p f)
!=C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0(not (file-symlink-p f))
!=C2=A0= =C2=A0=C2=A0 =C2=A0 =C2=A0f))
!= =C2=A0 =C2=A0=C2=A0 =C2= =A0 (directory-files pkg-dir t "[a-zA-Z].*" nil))))
=C2=A0 =C2=A0 =C2=A0 (let ((buf (find-buffer-visiting ge= nerated-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
=C2=A0 (defun package--make-autoloads-a= nd-stuff (pkg-desc pkg-dir)
=C2=A0 =C2=A0&q= uot;Generate autoloads, description file, etc. for PKG-DESC installed at PK= G-DIR."
=C2=A0 =C2=A0 (package-generat= e-autoloads (package-desc-name pkg-desc) pkg-dir)
=C2=A0 =C2=A0 (let ((desc-file (expand-file-name (package--descripti= on-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)))
***************

--001a113e22ac79fb380533dfef6e-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 31 12:50:08 2016 Received: (at control) by debbugs.gnu.org; 31 May 2016 16:50:08 +0000 Received: from localhost ([127.0.0.1]:48558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7mrn-0005Cg-Ur for submit@debbugs.gnu.org; Tue, 31 May 2016 12:50:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7mrm-0005C2-UB for control@debbugs.gnu.org; Tue, 31 May 2016 12:50:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7mrh-0006Rc-4G for control@debbugs.gnu.org; Tue, 31 May 2016 12:50:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7mrh-0006RL-0W for control@debbugs.gnu.org; Tue, 31 May 2016 12:50:01 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1b7mrg-00033j-1Q for control@debbugs.gnu.org; Tue, 31 May 2016 12:50:00 -0400 Subject: control message for bug 23636 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Tue, 31 May 2016 12:50:00 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.4 (------) forcemerge 23607 23636 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 23:41:04 2016 Received: (at control) by debbugs.gnu.org; 15 Jun 2016 03:41:04 +0000 Received: from localhost ([127.0.0.1]:41049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bD1hP-0002zt-T8 for submit@debbugs.gnu.org; Tue, 14 Jun 2016 23:41:04 -0400 Received: from mail-oi0-f52.google.com ([209.85.218.52]:32933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bD1hP-0002yz-2F for control@debbugs.gnu.org; Tue, 14 Jun 2016 23:41:03 -0400 Received: by mail-oi0-f52.google.com with SMTP id u201so15334756oie.0 for ; Tue, 14 Jun 2016 20:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to; bh=iOOJoTjEDiSKqftVoR/ow3xPMoKIM5lsIJAL/NGI9yM=; b=fwb5xe8MxWqi1zeHihJLOVdPtgJ6DyvTF8InxebwTx+Bp4qavFo4SAxKCAsYgVT+Od x6Wkj40ufr02wiisAdj4dEUn6KhnYtaAQcBgh+yRgskyzpzq16cQvpmIuGCgK6dEVw7g VP7TAPIS6KooAi5chouLcTDB/mXQwGZD39O9mKra5PGNtbMPqvE3RfETnUhrQ8XLdE2j PSNm3hsexBuLpqAJViNBpOJTfeB7LGyfQGRA90YaJ0MjTXNT+Seko3vlrtqGkHNNLvS+ 9DGGS923lUk++IlCYVcDtA18PxR/yqgz88bBLoM3Y3LCVv+l5fMwqytwwJ9L204bin9m nrMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=iOOJoTjEDiSKqftVoR/ow3xPMoKIM5lsIJAL/NGI9yM=; b=AhAg+VqT6ymKzGl3NkB60ZHzBc4gk0nNhJu1XdWuiJt2ekRoYFlsDOUgbdNuMU51dE xV0yGLpkjVZ+XQkQkG3zb6Wyol5zh9Mq+Capauv00eZD7MGNYf8pvauHKf4mIwKomsla ODrcN3h1I6s+JwRKJz3qI3g9L0yczKGmUYo0vDOfZSKZCHhmwYZsWgVdcPnA2SfxGJk6 YK+MtFfWni8UwJqRvROza+VO+HfofZkYN/ACunKr5Wukzo8NZ6PYn7UAA4uo4PHD/uzx e965NjYbFAzQvO85W/6lZCnG3QqbWXloBRaew0AgspYxKpwljknfgK9+HAXwS27PaBnL W0AQ== X-Gm-Message-State: ALyK8tLJMqwuleBcfgXffbyONDbQop9IrmPT0o/lDydIhhivJmD5RCUO/JWYLRCHuAbSD9ZzduoSj2XsVSgLGA== X-Received: by 10.202.195.70 with SMTP id t67mr10671378oif.88.1465962057732; Tue, 14 Jun 2016 20:40:57 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.44.103 with HTTP; Tue, 14 Jun 2016 20:40:57 -0700 (PDT) From: Noam Postavsky Date: Tue, 14 Jun 2016 23:40:57 -0400 X-Google-Sender-Auth: s6qZYbTLb5CGEKZr3RcbE6hvXv8 Message-ID: Subject: package.el subdirs To: GNU bug tracker automated control server Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) merge 23636 18976 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 15 11:56:58 2020 Received: (at control) by debbugs.gnu.org; 15 Sep 2020 15:56:58 +0000 Received: from localhost ([127.0.0.1]:60365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIDKE-0006OX-1x for submit@debbugs.gnu.org; Tue, 15 Sep 2020 11:56:58 -0400 Received: from quimby.gnus.org ([95.216.78.240]:46940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIDKC-0006O6-Aw for control@debbugs.gnu.org; Tue, 15 Sep 2020 11:56:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dEWZYyzkl9p5dob+Dq7SAHiNLFl29tE666XUK8cE4oA=; b=uD67TmTqge3DTSPyFTCLyre+YF JaJnQrcEpeBQ3fPLttqC2t48uGkdrqcrCEqU+l+nWevPdSMYD1cb2k9SVivKs+POOIazO7k05uVIS /75Rjsbx0Aj9iem78YseDLLLKr6ix15nNQC7r5wT01T8X4Dn/eK+UHc0reDnnWXsYt2U=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kIDK4-00022L-GR for control@debbugs.gnu.org; Tue, 15 Sep 2020 17:56:50 +0200 Date: Tue, 15 Sep 2020 17:56:47 +0200 Message-Id: <87o8m758zk.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #23607 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 23607 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 23607 quit