From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#69528: 30.0.50; [BUG] transient.el is not a member of package--builtin-versions Date: Mon, 3 Jun 2024 13:24:36 -0400 Message-ID: References: <87edcrtegz.fsf@gmail.com> <87sf15rjyf.fsf@gmail.com> <8734t5yh49.fsf@posteo.net> <87edcp9p54.fsf@breatheoutbreathe.in> <878qzypbav.fsf@posteo.net> <86ed9qyxnm.fsf@gnu.org> <871q5ffvs9.fsf@posteo.net> <87wmn7ebg5.fsf@posteo.net> <87mso3mc9p.fsf@breatheoutbreathe.in> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14799"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , Andrea Corallo , iarchivedmywholelife@gmail.com, Stefan Monnier , 69528@debbugs.gnu.org To: Joseph Turner , Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 03 19:26:14 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 1sEBRm-0003dG-7w for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 03 Jun 2024 19:26:14 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEBRO-00012T-Od; Mon, 03 Jun 2024 13:25:50 -0400 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 1sEBRN-000114-7G for bug-gnu-emacs@gnu.org; Mon, 03 Jun 2024 13:25:49 -0400 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 1sEBRN-0008G8-1F for bug-gnu-emacs@gnu.org; Mon, 03 Jun 2024 13:25:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sEBRZ-00082i-Rg for bug-gnu-emacs@gnu.org; Mon, 03 Jun 2024 13:26:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 03 Jun 2024 17:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69528 X-GNU-PR-Package: emacs Original-Received: via spool by 69528-submit@debbugs.gnu.org id=B69528.171743556030902 (code B ref 69528); Mon, 03 Jun 2024 17:26:01 +0000 Original-Received: (at 69528) by debbugs.gnu.org; 3 Jun 2024 17:26:00 +0000 Original-Received: from localhost ([127.0.0.1]:52259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEBRX-00082J-CR for submit@debbugs.gnu.org; Mon, 03 Jun 2024 13:25:59 -0400 Original-Received: from mail-ed1-f54.google.com ([209.85.208.54]:59701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEBRU-00081t-7g for 69528@debbugs.gnu.org; Mon, 03 Jun 2024 13:25:57 -0400 Original-Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-579fa270e53so5097542a12.3 for <69528@debbugs.gnu.org>; Mon, 03 Jun 2024 10:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717435477; x=1718040277; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=FKkQhwmjNkXDrAcQfENWEnXy9yjPkmuIMQqO7wgAdAQ=; b=XBTwgapNzL5IAFeIXg+Rq+Qw4duDue/sMFZuO5mGoLBgBYbQUfgyzbk62nZGWET1Nf 7BqE2IHfPzfUHZjxIYgdC5gUHE9HkeTVGkjulI13j9ymI4kH3IIvu3oLri4b6+B50Sb6 mutIFk+DFmOlx9ql5SqTVqMRctqSWD0rxkWStnrgAsZh5Eht9hEK+v14pH7Td6SNkhzi fxfGGr+yQ8RuPyWNrr/yO20sNiN80rBaUSjlMl2v0PGQ52dL6BbZ7qW0VY1hrcMfvCZ8 Z4d85ljDOeWJ6qR82KX1+CUCwf+eg7HTbnAiKvrk0jFgnqLrpigGvfLnTG7FyWyMRsfM Jnow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717435477; x=1718040277; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FKkQhwmjNkXDrAcQfENWEnXy9yjPkmuIMQqO7wgAdAQ=; b=rXCchRXUIr/bmocNH65Be0pZX0Bdh/cR8PtByLBAMIXF/FB2EY+W16mwUI7iN3Ro2b zOfv36ygPJ564yUirx8oeQf5Yayx69ANeqCf3G3By4bR56l/FlBrGoqmTX9QoBLypPO5 Qqm4k5aatAQV0m3ajGq5KQc1zZgXPVoc8DGmlkddFKHpvzG3y2l+CmFt1OyPWTcNWtsJ so22FfIQxNxNglxAuIHHqnxGAbsrqgNlgmFLGQQm+PBnIVDYRhCO9CVDqT0QVU0m86or hJSRdwJtSF0y+TmC10x91L4h1B3pN7nlqQie/nSbGXBG+gX3qq6Pky7WbFcvJ3fNAw+l oOFg== X-Forwarded-Encrypted: i=1; AJvYcCV5EZgUBfRJuRZtJg3VoM1IXYWJZrdUfHGxX8L1Z8ddLl+KC3CHjU8WI5WZ2cmb3TUSIXD1NZCLE80r0FWblF8bP7r8zGc= X-Gm-Message-State: AOJu0YwW1f+C7/fDBI3T5Km/CcLlAxr+oPwSBFbb36b1wZGDcisK95rz PuadFYkK9MNBQ08TEEVkssxWlYl6UI07ymwfogS6iXkm+M0TfhWvLNRBdZygZvzvwqbqohTpVsm uTxIOGlIRbRzXWP17aHpqRUPlkCw= X-Google-Smtp-Source: AGHT+IGUXw+5DYVtTl7vIOVFyEaLBcCUx98l/v8QmP6q9DYaljzsqUdhCXI0/sJDCJSXR+1+Qywdzw0Bmiek31znWMQ= X-Received: by 2002:a50:d494:0:b0:578:5eab:3f31 with SMTP id 4fb4d7f45d1cf-57a365cae19mr7719489a12.38.1717435477263; Mon, 03 Jun 2024 10:24:37 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 3 Jun 2024 13:24:36 -0400 In-Reply-To: <87mso3mc9p.fsf@breatheoutbreathe.in> 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:286479 Archived-At: Joseph Turner writes: >> Of course, that was also the change proposed in my first patch but I >> didn't notice the change in Joseph's suggestion. Ah, right. I somehow missed that part. > Thanks for the correction. Are the attached patches appropriate? Looks good to me, except for a few comments below. > From a666581f2a58568bb7f83a369e1040920a6b2c14 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 Bonus points if you add a test for this one. > * lisp/emacs-lisp/lisp-mnt.el (lm-version) See CONTRIBUTE for details, but this should read: * lisp/emacs-lisp/lisp-mnt.el (lm-version): Prefer version in the "Package-Version:" header. (Bug#69528) > --- > lisp/emacs-lisp/lisp-mnt.el | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el > index f111a77663c..5db0b50adc3 100644 > --- a/lisp/emacs-lisp/lisp-mnt.el > +++ b/lisp/emacs-lisp/lisp-mnt.el > @@ -415,7 +415,8 @@ lm-version > "Return the version listed in file FILE, or current buffer if FILE is nil. > This can be found in an RCS or SCCS header." It would be good to fix the docstring here to clarify that it can come from the "Version" or "Package-Version" headers too. > (lm-with-file file > - (or (lm-header "version") > + (or (lm-header "package-version") > + (lm-header "version") > (let ((header-max (lm-code-start))) > (goto-char (point-min)) > (cond > -- > 2.41.0 > > From 6c4262d7236c64bbc938f7b4e76988d95049b7c1 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) This should read something like this instead: * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file): Prefer 'lm-version'. (Bug#69528) > --- > 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 50e90cdf94c..f0355b25f57 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