Release branch emacs-29

Release branch emacs-29

[Eli Zaretskii]

I've cut the 'emacs-29' release branch, which starts the release cycle of
Emacs 29.1.  My hope is that the first pretest will be out in a couple of
months or so, barring any serious problems we find in the codebase.

From now on please install bug fixes to the emacs-29 branch (they will be
merged to master soon enough), while new features and improvements in
existing features should be installed on master.

Thanks.

Re: Release branch emacs-29

[Eli Zaretskii]

> Date: Mon, 28 Nov 2022 20:17:32 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> 
> From now on please install bug fixes to the emacs-29 branch (they will be
> merged to master soon enough), while new features and improvements in
> existing features should be installed on master.

There's one exception to this rule: additions and enhancements to the new
tree-sitter based major modes should go to the release branch, as this
feature did not yet have enough time on master to be considered stable.

When in doubt, please ask here.

Re: Release branch emacs-29

[Bastien]

Hi Eli,

Eli Zaretskii <eliz@gnu.org> writes:

> From now on please install bug fixes to the emacs-29 branch (they will be
> merged to master soon enough), while new features and improvements in
> existing features should be installed on master.

Org 9.6 has just been released:
https://list.orgmode.org/87pmd6p7qs.fsf@gnu.org/T/#u 

I interpreted "late november" a bit too extremely and thought tomorrow
was the deadline for merging Org 9.6 with the Emacs development branch.

Is it okay to make an exception and sync 9.6 with the emacs-29 branch?

Thanks,

-- 
 Bastien

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Bastien <bzg@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Tue, 29 Nov 2022 08:08:06 +0100
> 
> Is it okay to make an exception and sync 9.6 with the emacs-29 branch?

Yes, thanks.

Re: Release branch emacs-29

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

> From now on please install bug fixes to the emacs-29 branch (they will be
> merged to master soon enough), while new features and improvements in
> existing features should be installed on master.

Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
in Emacs 29?

It'll be nice to have a dedicated "term/eat.el" with all XTerm features
enabled (xterm-extra-capabilities), but I think it'd be better to add
this to Emacs 30.

-- 
Akib Azmain Turja, GPG key: 70018CE5819F17A3BBA666AFE74F0EFA922AE7F5
Fediverse: akib@hostux.social
Codeberg: akib
emailselfdefense.fsf.org | "Nothing can be secure without encryption."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Release branch emacs-29

[Stefan Kangas]

Eli Zaretskii <eliz@gnu.org> writes:

> From now on please install bug fixes to the emacs-29 branch (they will be
> merged to master soon enough), while new features and improvements in
> existing features should be installed on master.

Now that we have sorted out all copyright assignment details, I have
pushed a new version of scratch/use-package.  Everything that we do not
have a copyright assignment for has been checked and correctly marked
with "Copyright-paperwork-exempt: yes".

On that branch are the following newly added files:

    ├── doc
    │   └── misc
    │       └── use-package.texi
    ├── lisp
    │   └── use-package
    │       ├── bind-chord.el
    │       ├── bind-key.el
    │       ├── use-package-bind-key.el
    │       ├── use-package-chords.el
    │       ├── use-package-core.el
    │       ├── use-package-delight.el
    │       ├── use-package-diminish.el
    │       ├── use-package-ensure-system-package.el
    │       ├── use-package-ensure.el
    │       ├── use-package-jump.el
    │       ├── use-package-lint.el
    │       └── use-package.el
    └── test
        └── lisp
            └── use-package
                ├── use-package-chords-tests.el
                └── use-package-tests.el

    7 directories, 15 files

Is it preferred that I merge to master or emacs-29 at this point?

Thanks.

PS. The latest version of the merge scripts are here:
    https://gist.github.com/skangas/0f853d5ae90aba90f18ab27236aaaaa7

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Tue, 29 Nov 2022 11:24:47 -0800
> Cc: John Wiegley <johnw@gnu.org>
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > From now on please install bug fixes to the emacs-29 branch (they will be
> > merged to master soon enough), while new features and improvements in
> > existing features should be installed on master.
> 
> Now that we have sorted out all copyright assignment details, I have
> pushed a new version of scratch/use-package.  Everything that we do not
> have a copyright assignment for has been checked and correctly marked
> with "Copyright-paperwork-exempt: yes".

What is the status of the manual?  I don't see any FIXMEs or notes what else
should be done -- is it finished?

Also, I see no announcement on NEWS for use-package -- did I miss it?

> On that branch are the following newly added files:
> 
>     ├── doc
>     │   └── misc
>     │       └── use-package.texi
>     ├── lisp
>     │   └── use-package
>     │       ├── bind-chord.el
>     │       ├── bind-key.el
>     │       ├── use-package-bind-key.el
>     │       ├── use-package-chords.el
>     │       ├── use-package-core.el
>     │       ├── use-package-delight.el
>     │       ├── use-package-diminish.el
>     │       ├── use-package-ensure-system-package.el
>     │       ├── use-package-ensure.el
>     │       ├── use-package-jump.el
>     │       ├── use-package-lint.el
>     │       └── use-package.el
>     └── test
>         └── lisp
>             └── use-package
>                 ├── use-package-chords-tests.el
>                 └── use-package-tests.el
> 
>     7 directories, 15 files

Btw, I'm quite surprised to see that it's such a large package.

> Is it preferred that I merge to master or emacs-29 at this point?

To emacs-29, please.  But it looks like you forked the branch from master,
so you will have to redo that by forking from emacs-29, or else you will
have merge conflicts and/or will undo stuff that was fixed on the release
branch and not yet merged to master.

Thanks.

Re: Release branch emacs-29

[Bastien]

Eli Zaretskii <eliz@gnu.org> writes:

> Yes, thanks.

Thanks!  Kyle is working on that.

-- 
 Bastien

Re: Release branch emacs-29

[Stefan Monnier]

> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
> in Emacs 29?

I don't think we need that.    Just add a `term/eat.el` file to your
package with a `terminal-init-eat` function that calls
`terminal-init-xterm`.  Or even just:
(defalias 'terminal-init-eat 'terminal-init-xterm)


        Stefan

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: emacs-devel@gnu.org
> Date: Tue, 29 Nov 2022 19:26:46 +0600
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > From now on please install bug fixes to the emacs-29 branch (they will be
> > merged to master soon enough), while new features and improvements in
> > existing features should be installed on master.
> 
> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
> in Emacs 29?

I don't know what this would mean, so I cannot make up my mind.  Is it
indeed the same as xterm?

> It'll be nice to have a dedicated "term/eat.el" with all XTerm features
> enabled (xterm-extra-capabilities), but I think it'd be better to add
> this to Emacs 30.

It is definitely an easier decision to add that on master.  But still, it
would be best to hear the reasons why you think this is a valid alias.

Re: Release branch emacs-29

[Stefan Kangas]

Eli Zaretskii <eliz@gnu.org> writes:

> What is the status of the manual?  I don't see any FIXMEs or notes what else
> should be done -- is it finished?

No, I'm still working on it.  This is my main focus currently, and I
expect that the new manual will take at least another week to finish at
the current rate..

Most of the things that needed transferring from README.md are already
done.  But there hasn't been much progress since my last update, as I've
focused on the merge in the last week or so.

> Also, I see no announcement on NEWS for use-package -- did I miss it?

There was none indeed, but on the new branch feature/use-package
(replacing scratch/use-package), you can now find it announced in NEWS.

>> Is it preferred that I merge to master or emacs-29 at this point?
>
> To emacs-29, please.

OK, thanks.

> But it looks like you forked the branch from master,

This is fixed on feature/use-package.

Re: Release branch emacs-29

[Stefan Monnier]

>> From now on please install bug fixes to the emacs-29 branch (they will be
>> merged to master soon enough), while new features and improvements in
>> existing features should be installed on master.
> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
> in Emacs 29?

If it's really "the same", then a better option is for `eat.el` to set
$TERM to `xterm`.


        Stefan

Re: Release branch emacs-29

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 723 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>> From now on please install bug fixes to the emacs-29 branch (they will be
>>> merged to master soon enough), while new features and improvements in
>>> existing features should be installed on master.
>> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
>> in Emacs 29?
>
> If it's really "the same", then a better option is for `eat.el` to set
> $TERM to `xterm`.
>
>
>         Stefan
>
>

No, it's similar but still not the same.

-- 
Akib Azmain Turja, GPG key: 70018CE5819F17A3BBA666AFE74F0EFA922AE7F5
Fediverse: akib@hostux.social
Codeberg: akib
emailselfdefense.fsf.org | "Nothing can be secure without encryption."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Release branch emacs-29

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
>> in Emacs 29?
>
> I don't think we need that.    Just add a `term/eat.el` file to your
> package with a `terminal-init-eat` function that calls
> `terminal-init-xterm`.  Or even just:
> (defalias 'terminal-init-eat 'terminal-init-xterm)
>
>
>         Stefan
>
>

Just this?  I'll definitely try that.  :)

-- 
Akib Azmain Turja, GPG key: 70018CE5819F17A3BBA666AFE74F0EFA922AE7F5
Fediverse: akib@hostux.social
Codeberg: akib
emailselfdefense.fsf.org | "Nothing can be secure without encryption."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Release branch emacs-29

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 1710 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Akib Azmain Turja <akib@disroot.org>
>> Cc: emacs-devel@gnu.org
>> Date: Tue, 29 Nov 2022 19:26:46 +0600
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> > From now on please install bug fixes to the emacs-29 branch (they will be
>> > merged to master soon enough), while new features and improvements in
>> > existing features should be installed on master.
>> 
>> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
>> in Emacs 29?
>
> I don't know what this would mean, so I cannot make up my mind.  Is it
> indeed the same as xterm?

Nope, but similar.  XTerm compatibility hasn't been achieved, yet.

>
>> It'll be nice to have a dedicated "term/eat.el" with all XTerm features
>> enabled (xterm-extra-capabilities), but I think it'd be better to add
>> this to Emacs 30.
>
> It is definitely an easier decision to add that on master.  But still, it
> would be best to hear the reasons why you think this is a valid alias.

Because it allows to get all the XTerm benefits (like extra keybindings,
clipboard) in Eat.  And if you don't know what's Eat, it's a terminal
emulator package I wrote.

I have "eat" aliased to "xterm" so a month or two in my init file, and
it works fine on my Emacs.

But, Stefan Monnier suggested that including term/eat.el in my package
would also work.  So I think I should try that first, since the people
using Emacs in Eat would probably have Eat installed, am I right?

-- 
Akib Azmain Turja, GPG key: 70018CE5819F17A3BBA666AFE74F0EFA922AE7F5
Fediverse: akib@hostux.social
Codeberg: akib
emailselfdefense.fsf.org | "Nothing can be secure without encryption."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> Date: Thu, 01 Dec 2022 02:36:30 +0600
> 
> >> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
> >> in Emacs 29?
> >
> > If it's really "the same", then a better option is for `eat.el` to set
> > $TERM to `xterm`.
> 
> No, it's similar but still not the same.

What are the differences?

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: emacs-devel@gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>
> Date: Thu, 01 Dec 2022 02:44:07 +0600
> 
> But, Stefan Monnier suggested that including term/eat.el in my package
> would also work.  So I think I should try that first, since the people
> using Emacs in Eat would probably have Eat installed, am I right?

Yes, I think so.

Re: Release branch emacs-29

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Akib Azmain Turja <akib@disroot.org>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
>> Date: Thu, 01 Dec 2022 02:36:30 +0600
>> 
>> >> Is it possible to alias terminal "eat" to "xterm" in 'term-file-aliases'
>> >> in Emacs 29?
>> >
>> > If it's really "the same", then a better option is for `eat.el` to set
>> > $TERM to `xterm`.
>> 
>> No, it's similar but still not the same.
>
> What are the differences?

Many unknown difference not yet discovered.  XTerm is huge, and AFAIK
there isn't any specification.  The target is however to implement all
the XTerm supported escape sequences that make sense.

-- 
Akib Azmain Turja, GPG key: 70018CE5819F17A3BBA666AFE74F0EFA922AE7F5
Fediverse: akib@hostux.social
Codeberg: akib
emailselfdefense.fsf.org | "Nothing can be secure without encryption."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: monnier@iro.umontreal.ca,  emacs-devel@gnu.org
> Date: Thu, 01 Dec 2022 22:47:50 +0600
> 
> >> No, it's similar but still not the same.
> >
> > What are the differences?
> 
> Many unknown difference not yet discovered.  XTerm is huge, and AFAIK
> there isn't any specification.  The target is however to implement all
> the XTerm supported escape sequences that make sense.

The most complete spec of xterm known to me is here:

  https://invisible-island.net/xterm/ctlseqs/ctlseqs.html

Re: Release branch emacs-29

[Stefan Kangas]

It took me about as much time as expected to rewrite the use-package
manual, but it is now finally done.  I'm sure more tweaks and additions
will be needed, especially as I work through the documentation bugs on
the old use-package issue tracker.[1]  Meanwhile, I obviously welcome any
and all reviews, patches or feedback.

I hope that the feature/use-package branch now looks okay for merging
into emacs-29, but I'll wait for a final confirmation from Eli first.

Thanks.

Footnotes:
[1]  https://github.com/jwiegley/use-package/issues?q=is%3Aissue+is%3Aopen+label%3Adocs

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Wed, 7 Dec 2022 16:20:03 -0800
> Cc: emacs-devel@gnu.org, johnw@gnu.org
> 
> It took me about as much time as expected to rewrite the use-package
> manual, but it is now finally done.  I'm sure more tweaks and additions
> will be needed, especially as I work through the documentation bugs on
> the old use-package issue tracker.[1]  Meanwhile, I obviously welcome any
> and all reviews, patches or feedback.
> 
> I hope that the feature/use-package branch now looks okay for merging
> into emacs-29, but I'll wait for a final confirmation from Eli first.

Thanks for working on this.

I took a quick look, and I see no issues which would prevent landing
this on emacs-29.  The manual still needs some work (e.g.,
@insertcopying is not in the correct place, the Index node should not
be under "Appendices", and there should be a lot more index entries),
but I see nothing that couldn't be rectified on the release branch.

Re: Release branch emacs-29

[Stefan Kangas]

Eli Zaretskii <eliz@gnu.org> writes:

> I took a quick look, and I see no issues which would prevent landing
> this on emacs-29.

Thanks, so I merged it.

> The manual still needs some work (e.g., @insertcopying is not in the
> correct place, the Index node should not be under "Appendices", and
> there should be a lot more index entries), but I see nothing that
> couldn't be rectified on the release branch.

I couldn't figure out what should be changed with regards to
@insertcopying and the Index node, so I'd appreciate your help with
that.  We can work on the index over time, but help with that is also
appreciated as I've struggled to come up with good entries.

Re: Release branch emacs-29

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Thu, 8 Dec 2022 14:20:50 -0800
> Cc: emacs-devel@gnu.org, johnw@gnu.org
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > The manual still needs some work (e.g., @insertcopying is not in the
> > correct place, the Index node should not be under "Appendices", and
> > there should be a lot more index entries), but I see nothing that
> > couldn't be rectified on the release branch.
> 
> I couldn't figure out what should be changed with regards to
> @insertcopying and the Index node, so I'd appreciate your help with
> that.

It's out of place, IMO, and should be moved.  Look at where other
Texinfo files put that directive.

> We can work on the index over time, but help with that is also
> appreciated as I've struggled to come up with good entries.

I'll get to that eventually.

Re: Release branch emacs-29

[Eli Zaretskii]

> Date: Fri, 09 Dec 2022 08:52:14 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org, johnw@gnu.org
> 
> > I couldn't figure out what should be changed with regards to
> > @insertcopying and the Index node, so I'd appreciate your help with
> > that.
> 
> It's out of place, IMO, and should be moved.  Look at where other
> Texinfo files put that directive.

That was my mistake, sorry: there's nothing wrong with @insertcopying.

> > We can work on the index over time, but help with that is also
> > appreciated as I've struggled to come up with good entries.
> 
> I'll get to that eventually.

Well, the eventuality is here: I did that now.

Please note that I added a few FIXME comments there; perhaps you or
John can help us improve those parts.