bug#54154: Emacs commit ae963e80a79f5a9184daabfc8197f211a39b136d (sieve-manage)

[Kai Tetzlaff]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Kai Tetzlaff <emacs+bug@tetzco.de>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  larsi@gnus.org,  54154@debbugs.gnu.org
>> Date: Mon, 23 Jan 2023 14:01:02 +0100
>> 
>> "Herbert J. Skuhra" <herbert@gojira.at> writes:
>> 
>> > On Mon, Jan 23, 2023 at 01:59:09AM +0100, Kai Tetzlaff wrote:
>> >> Just a quick update (also answering my own question(s) below):
>> >> 
>> >> Regarding the status of this bug report: The fix for emacs-29 which was
>> >> initially intended to be emacs-29 only has (inadvertently?) found its way
>> >> to master. 
>> >
>> > No, the change was not merged to master.
>> Hmm, what about:
>> 
>>     $ git log --grep "^Fix bug in 'sieve-manage--append-to-log" origin/master
>>     commit 12d7670b90f66f1d45a8c69d9acfc25238a65b02
>>     Author: Kai Tetzlaff <emacs@tetzco.de>
>>     Date:   2023-01-19 03:16:14 +0100
>>     
>>         Fix bug in 'sieve-manage--append-to-log'
>>     
>>         * lisp/net/sieve-manage.el (sieve-manage--append-to-log): Fix
>>         log buffer creation.  (Bug#54154)  Do not merge to master.
>
> The "Do not merge to master" part prevents its merging to the master
> branch.

Yes, I just was under the wrong assumption that this didn't work.

> This was according to your request: you intended (and still do, AFAIU)
> to fix this differently on the master branch, for Emacs 30.

Correct, I'm still working on additional sieve-manage changes for
master. However, I've now updated/reordered the patches. And from
my POV, the following are ready to be applied to master:

1. 0001-Fix-bug-in-sieve-manage-append-to-log-and-do-some-re.patch: This
   is the master version of the patch which has been added to emacs-29.

2. 0002-Handle-BYE-in-sieve-manage-server-responses.patch: Adds support
   for BYE in server responses.

3. 0003-Some-minor-fixes-in-lisp-net-sieve.el.patch: Fixes some minor
   usability issues in sieve.el.

4. 0004-Autodetect-eol-type-of-sieve-manage-scripts.patch: Adds eol-type
   autodetection. Avoids showing '^M's in sieve script buffers for
   scripts which use CRLF EOLs.


For the other two:

5. 0005-Add-test-lisp-net-sieve-manage-tests.el.patch: This adds a first
   test which verifies that multibyte script names and scripts can be
   downloaded without issues. I wrote this already last year, but then
   Lars committed what was on debbugs before I got to add it there.
   However, since I've already added additional tests in patch 0006-*,
   it might not be worth adding this one right now. Up to you...

6. 0006-WiP-new-encode-tested-OK.patch: This is contains my current WiP
   status. It works but is not ready/finished. It will probably take me
   one or two weeks to finish it. Some of the changes affect code
   which got updated/added in patches 0001/0002/0004. And there are a
   lot of new tests.


Eli, how do you want to handle this? Apply the first patches now? Wait
until I'm done with all all of them? Or, ...? Feedback appreciated!


Thanks,
Kai

0001-Fix-bug-in-sieve-manage-append-to-log-and-do-some-re.patch
Description: Text Data

0002-Handle-BYE-in-sieve-manage-server-responses.patch
Description: Text Data

0003-Some-minor-fixes-in-lisp-net-sieve.el.patch
Description: Text Data

0004-Autodetect-eol-type-of-sieve-manage-scripts.patch
Description: Text Data

0005-Add-test-lisp-net-sieve-manage-tests.el.patch
Description: Text Data

0006-WiP-new-encode-tested-OK.patch
Description: Text Data