From: Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 70502-done@debbugs.gnu.org
Subject: bug#70502: 30.0.50; Widget manual typos etc.
Date: Mon, 22 Apr 2024 11:56:43 +0200 [thread overview]
Message-ID: <87zftld8kk.fsf@gmx.net> (raw)
In-Reply-To: <86r0ex67w5.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 22 Apr 2024 12:53:14 +0300")
On Mon, 22 Apr 2024 12:53:14 +0300 Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Stephen Berman <stephen.berman@gmx.net>
>> Cc: 70502@debbugs.gnu.org
>> Date: Mon, 22 Apr 2024 11:39:41 +0200
>>
>> On Mon, 22 Apr 2024 08:31:39 +0300 Eli Zaretskii <eliz@gnu.org> wrote:
>>
>> > Everything you say is correct, and the patch is OK. Thanks, feel free
>> > to install on the emacs-29 branch (assuming the same problems exist in
>> > this manual there as well).
>>
>> Thanks, done as commit 2a533514929. The only differences before that
>> between widget.texi in emacs-29 and master were the recent changes in
>> commit 91333dacfa1 on master (bug#70413). Will those differences
>> prevent merging the new changes in emacs-29 to master?
>
> I hope not. But even if they do, resolving these conflicts is almost
> trivial, and is routinely done at merge time.
Ok, thanks. So now I'm closing this bug.
Steve Berman
prev parent reply other threads:[~2024-04-22 9:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-21 19:42 bug#70502: 30.0.50; Widget manual typos etc Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-22 5:31 ` Eli Zaretskii
2024-04-22 9:39 ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-22 9:53 ` Eli Zaretskii
2024-04-22 9:56 ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
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=87zftld8kk.fsf@gmx.net \
--to=bug-gnu-emacs@gnu.org \
--cc=70502-done@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=stephen.berman@gmx.net \
/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).