From: Robert Pluim <rpluim@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: master e714b31 3/6: Merge from origin/emacs-28
Date: Wed, 10 Nov 2021 18:18:14 +0100 [thread overview]
Message-ID: <87sfw4gca1.fsf@gmail.com> (raw)
In-Reply-To: <83k0hg2avf.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 10 Nov 2021 19:12:20 +0200")
>>>>> On Wed, 10 Nov 2021 19:12:20 +0200, Eli Zaretskii <eliz@gnu.org> said:
>> From: Robert Pluim <rpluim@gmail.com>
>> Cc: Eli Zaretskii <eliz@gnu.org>
>> Date: Wed, 10 Nov 2021 16:55:40 +0100
>>
Eli> +++
Eli> -*** 'slot-value' can now be used to read slots of 'cl-defstruct' objects
>>
>> This line was a merge error, which Iʼve fixed. There may be more
>> lurking.
Eli> Sorry about that.
Merging NEWS is easy to get wrong, especially with the '+++' '---'
markers (I got it wrong when fixing the merge, and was about to blame
Stefan for not documenting his changes 😼).
>> I vote +1 on the suggestion to just start using etc/NEWS.29
Eli> I think I found the reason why merging NEWS didn't work for me, so it
Eli> won't happen again. There was sufficient resistance to using a
Eli> versioned name, so we should stick to what we have as long as it works
Eli> well enough.
OK.
Robert
--
next prev parent reply other threads:[~2021-11-10 17:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211106092430.31690.17236@vcs0.savannah.gnu.org>
[not found] ` <20211106092433.20A2420A22@vcs0.savannah.gnu.org>
2021-11-10 15:55 ` master e714b31 3/6: Merge from origin/emacs-28 Robert Pluim
2021-11-10 16:41 ` Stefan Monnier
2021-11-10 17:12 ` Eli Zaretskii
2021-11-10 17:18 ` Robert Pluim [this message]
2021-11-10 18:24 ` Juri Linkov
2021-11-10 18:37 ` Juri Linkov
2021-11-10 18:53 ` Eli Zaretskii
2021-11-10 19:06 ` Juri Linkov
2021-11-10 19:13 ` Eli Zaretskii
2021-11-10 18:46 ` Eli Zaretskii
2021-11-10 17:49 ` Stefan Kangas
2021-11-10 18:47 ` Eli Zaretskii
2021-11-10 19:19 ` Stefan Kangas
2021-11-10 19:36 ` Eli Zaretskii
2021-11-10 19:50 ` Dmitry Gutov
2021-11-10 20:09 ` Stefan Kangas
2021-11-11 7:23 ` Michael Albinus
2021-11-10 19:37 ` Stefan Kangas
2021-11-11 1:24 ` Lars Ingebrigtsen
2021-11-17 4:04 ` Stefan Kangas
2021-11-17 7:11 ` Eli Zaretskii
2021-11-17 7:56 ` Lars Ingebrigtsen
2021-11-17 9:58 ` Eli Zaretskii
2021-11-17 14:03 ` Eli Zaretskii
2021-11-18 1:59 ` Stefan Kangas
2021-11-18 8:07 ` Eli Zaretskii
2021-11-18 9:25 ` Lars Ingebrigtsen
2021-11-18 11:10 ` Eli Zaretskii
2021-11-18 16:27 ` Dmitry Gutov
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sfw4gca1.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).