From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#69528: 30.0.50; [BUG] transient.el is not a member of package--builtin-versions Date: Mon, 04 Mar 2024 22:17:30 -0800 Message-ID: <87edcp9p54.fsf@breatheoutbreathe.in> References: <87edcrtegz.fsf@gmail.com> <87sf15rjyf.fsf@gmail.com> <8734t5yh49.fsf@posteo.net> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34459"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 69528@debbugs.gnu.org, iarchivedmywholelife@gmail.com To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 05 07:20:57 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rhOAa-0008eq-JM for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 05 Mar 2024 07:20:56 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhOAL-0000kQ-IL; Tue, 05 Mar 2024 01:20:41 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhOAD-0000eJ-LG for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2024 01:20:35 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhOAC-0001CK-82 for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2024 01:20:33 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhOAg-0000q9-8I for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2024 01:21:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 05 Mar 2024 06:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69528 X-GNU-PR-Package: emacs X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org, No Wayman , 69528@debbugs.gnu.org Original-Received: via spool by 69528-submit@debbugs.gnu.org id=B69528.17096196533200 (code B ref 69528); Tue, 05 Mar 2024 06:21:02 +0000 Original-Received: (at 69528) by debbugs.gnu.org; 5 Mar 2024 06:20:53 +0000 Original-Received: from localhost ([127.0.0.1]:45836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhOAV-0000pX-M3 for submit@debbugs.gnu.org; Tue, 05 Mar 2024 01:20:53 -0500 Original-Received: from out-180.mta1.migadu.com ([95.215.58.180]:62192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhOAQ-0000pF-8F for 69528@debbugs.gnu.org; Tue, 05 Mar 2024 01:20:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1709619579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U/wSPqUeIi7awFdaUdt9Xlsr7HdUp0mGi1YswaLazYs=; b=ld4KcH1ET7TzF7I6g2wEAHEJx5inpL2ZTzTlUcK3fYhH0s8jc3yX+rch0zUVwqTQQSaI+4 /JGoocOxFpCcJZCfMCWHOsV7ZHUoxu6noU2dy18QLsXteQbviSMGGJwUcZdAJedMusxA5N lZDDBaB3QoQm8y9/TzMo7pUthYH8E0Y= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: <8734t5yh49.fsf@posteo.net> X-Migadu-Flow: FLOW_OUT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:281030 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: > So in general, this patch might be appropriate? > > diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el > index 581053f6304..42f386933dc 100644 > --- a/lisp/emacs-lisp/loaddefs-gen.el > +++ b/lisp/emacs-lisp/loaddefs-gen.el > @@ -433,7 +433,8 @@ loaddefs-generate--parse-file > ;; loaddefs for packages so that `syntax-ppss' later gives > ;; correct results. > (emacs-lisp-mode) > - (let ((version (lm-header "version")) > + (let ((version (or (lm-header "package-version") > + (lm-header "version"))) > package) > (when (and version > (setq version (ignore-errors (version-to-list version))) > > What about making `lm-version' handle the "package-version" header then using `lm-version' in loaddefs-generate--parse-file? See patches. Joseph --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Use-lm-version-instead-of-lm-header-version.patch >From e83ee369ae90e5e15b3adca9eab1ded4db864427 Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Mon, 4 Mar 2024 22:15:50 -0800 Subject: [PATCH 2/2] Use lm-version instead of lm-header "version" bug#69528 * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file) --- lisp/emacs-lisp/loaddefs-gen.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index 581053f6304..6b24f7dc8c7 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -433,7 +433,7 @@ loaddefs-generate--parse-file ;; loaddefs for packages so that `syntax-ppss' later gives ;; correct results. (emacs-lisp-mode) - (let ((version (lm-header "version")) + (let ((version (lm-version)) package) (when (and version (setq version (ignore-errors (version-to-list version))) -- 2.41.0 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Check-Package-Version-header-in-lm-version-also.patch >From 20db8c9afcb03d8a5acb750fa738c5066e204401 Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Mon, 4 Mar 2024 22:14:26 -0800 Subject: [PATCH 1/2] Check Package-Version: header in lm-version also * lisp/emacs-lisp/lisp-mnt.el (lm-version) --- lisp/emacs-lisp/lisp-mnt.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index f111a77663c..12b23853801 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -416,6 +416,7 @@ lm-version This can be found in an RCS or SCCS header." (lm-with-file file (or (lm-header "version") + (lm-header "package-version") (let ((header-max (lm-code-start))) (goto-char (point-min)) (cond -- 2.41.0 --=-=-=--