From: Philip Kaludercic <philipk@posteo.net>
To: Joseph Turner <joseph@breatheoutbreathe.in>
Cc: 69528@debbugs.gnu.org, iarchivedmywholelife@gmail.com
Subject: bug#69528: 30.0.50; [BUG] transient.el is not a member of package--builtin-versions
Date: Sat, 25 May 2024 08:04:24 +0000 [thread overview]
Message-ID: <878qzypbav.fsf@posteo.net> (raw)
In-Reply-To: <87edcp9p54.fsf@breatheoutbreathe.in> (Joseph Turner's message of "Mon, 04 Mar 2024 22:17:30 -0800")
Joseph Turner <joseph@breatheoutbreathe.in> writes:
> Philip Kaludercic <philipk@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).
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@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@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@breatheoutbreathe.in> writes:
> Joseph Turner <joseph@breatheoutbreathe.in> writes:
>
>> Philip Kaludercic <philipk@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@gnu.org> 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" <bug-gnu-emacs@gnu.org>
>>
>> Joseph Turner <joseph@breatheoutbreathe.in> writes:
>>
>> > Philip Kaludercic <philipk@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
>
>
>
>
--
Philip Kaludercic on peregrine
next prev parent reply other threads:[~2024-05-25 8:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-03 17:25 bug#69528: 30.0.50; [BUG] transient.el is not a member of package--builtin-versions No Wayman
2024-03-04 17:22 ` No Wayman
2024-03-04 18:41 ` Philip Kaludercic
2024-03-05 6:17 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-09 6:53 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-25 7:39 ` Eli Zaretskii
2024-05-25 8:04 ` Philip Kaludercic [this message]
2024-05-25 8:08 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-25 8:47 ` Philip Kaludercic
2024-05-26 0:45 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-25 10:49 ` Eli Zaretskii
2024-06-02 10:36 ` Stefan Kangas
2024-06-02 11:07 ` Philip Kaludercic
2024-06-02 12:08 ` Stefan Kangas
2024-06-02 13:11 ` Philip Kaludercic
2024-06-02 18:26 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-02 18:40 ` Philip Kaludercic
2024-06-03 17:24 ` Stefan Kangas
2024-06-03 19:24 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-03 19:58 ` Philip Kaludercic
2024-06-03 20:38 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-04 22:19 ` Stefan Kangas
2024-06-04 22:34 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-04 22:22 ` Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878qzypbav.fsf@posteo.net \
--to=philipk@posteo.net \
--cc=69528@debbugs.gnu.org \
--cc=iarchivedmywholelife@gmail.com \
--cc=joseph@breatheoutbreathe.in \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.