Package: emacs;
Reported by: No Wayman <iarchivedmywholelife <at> gmail.com>
Date: Sun, 3 Mar 2024 17:26:02 UTC
Severity: normal
Found in version 30.0.50
Message #32 received at 69528 <at> debbugs.gnu.org (full text, mbox):
From: Joseph Turner <joseph <at> breatheoutbreathe.in> To: Philip Kaludercic <philipk <at> posteo.net> Cc: eliz <at> gnu.org, 69528 <at> debbugs.gnu.org, iarchivedmywholelife <at> gmail.com Subject: Re: 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
Philip Kaludercic <philipk <at> posteo.net> writes: > Joseph Turner <joseph <at> breatheoutbreathe.in> writes: > >> Philip Kaludercic <philipk <at> posteo.net> 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 <joseph <at> breatheoutbreathe.in> >> 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 <joseph <at> breatheoutbreathe.in> >> 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 <joseph <at> breatheoutbreathe.in> writes: > >> Joseph Turner <joseph <at> breatheoutbreathe.in> writes: >> >>> Philip Kaludercic <philipk <at> posteo.net> 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 <eliz <at> gnu.org> writes: > >> Ping! Ping! Philip, can you please chime in? >> >>> Cc: 69528 <at> debbugs.gnu.org, iarchivedmywholelife <at> 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" <bug-gnu-emacs <at> gnu.org> >>> >>> Joseph Turner <joseph <at> breatheoutbreathe.in> writes: >>> >>> > Philip Kaludercic <philipk <at> posteo.net> 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 >> >> >> >>
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.