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: Sat, 25 May 2024 01:08:08 -0700 Message-ID: <87o78ul3fb.fsf@breatheoutbreathe.in> References: <87edcrtegz.fsf@gmail.com> <87sf15rjyf.fsf@gmail.com> <8734t5yh49.fsf@posteo.net> <87edcp9p54.fsf@breatheoutbreathe.in> <878qzypbav.fsf@posteo.net> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37244"; mail-complaints-to="usenet@ciao.gmane.io" Cc: eliz@gnu.org, 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 Sat May 25 10:09:08 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 1sAmSg-0009Ok-Vl for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 25 May 2024 10:09:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAmSW-0006As-A2; Sat, 25 May 2024 04:08:56 -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 1sAmSV-0006Af-2m for bug-gnu-emacs@gnu.org; Sat, 25 May 2024 04:08:55 -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 1sAmSU-0003kC-Q1 for bug-gnu-emacs@gnu.org; Sat, 25 May 2024 04:08:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAmSc-00079p-5X for bug-gnu-emacs@gnu.org; Sat, 25 May 2024 04:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 25 May 2024 08:09:02 +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.171662451027507 (code B ref 69528); Sat, 25 May 2024 08:09:02 +0000 Original-Received: (at 69528) by debbugs.gnu.org; 25 May 2024 08:08:30 +0000 Original-Received: from localhost ([127.0.0.1]:41987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAmS5-00079b-Fs for submit@debbugs.gnu.org; Sat, 25 May 2024 04:08:30 -0400 Original-Received: from out-177.mta0.migadu.com ([91.218.175.177]:60447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAmS3-00079T-HD for 69528@debbugs.gnu.org; Sat, 25 May 2024 04:08:28 -0400 X-Envelope-To: philipk@posteo.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1716624493; 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=j3U2I3F+Kddg2uVrvC7i8vKO8eJmaV+ohwtHoRirByc=; b=FyN1MMIJhNGg0PxN8A3reDaeQE2iIb5WXZ3DSc3SY82inw81bBenpUkNOQdgA5QThPnMMF JJ6r6VxP3/9m3XqRzZ9GyKqUJ+wbc8pRbZ1DH2PtKWC9jvFEzEIwpBQtsLCqCvNzX4SYIu Nl3FohSCi/MalfwREgGV/uSG/7GyFvQ= X-Envelope-To: 69528@debbugs.gnu.org X-Envelope-To: iarchivedmywholelife@gmail.com X-Envelope-To: eliz@gnu.org X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: <878qzypbav.fsf@posteo.net> (Philip Kaludercic's message of "Sat, 25 May 2024 08:04:24 +0000") 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:285839 Archived-At: Philip Kaludercic writes: > Joseph Turner writes: > >> 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. > > My main concern was if we want to have Package-Version always override > Version, but if my patch modified loaddefs-gen, then I don't think there > is much of a difference if we change lisp-mnt instead (in terms of the > generality of the change). If it would be more appropriate, I can resubmit another patch with "Version" used preferentially over "Package-Version". > So I am fine with the change, and think we can merge it. Eli: Is master > still fine for these kinds of changes? > >> Joseph >> >>>>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 >> >> >>>>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 > > Joseph Turner writes: > >> Joseph Turner writes: >> >>> 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 >>> >>> [2. text/x-diff; 0002-Use-lm-version-instead-of-lm-header-version.patch]... >>> >>> [3. text/x-diff; 0001-Check-Package-Version-header-in-lm-version-also.patch]... >> >> Ping! >> >> >> >> > > Eli Zaretskii writes: > >> Ping! Ping! Philip, can you please chime in? >> >>> Cc: 69528@debbugs.gnu.org, iarchivedmywholelife@gmail.com >>> Date: Wed, 08 May 2024 23:53:38 -0700 >>> From: Joseph Turner via "Bug reports for GNU Emacs, >>> the Swiss army knife of text editors" >>> >>> Joseph Turner writes: >>> >>> > 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 >> >> >> >>