]> git.eshelyaron.com Git - emacs.git/commit
Fix date-stamp regression in erc-fill-wrap
authorF. Jason Park <jp@neverwas.me>
Fri, 9 Feb 2024 04:28:56 +0000 (20:28 -0800)
committerEshel Yaron <me@eshelyaron.com>
Wed, 29 May 2024 10:11:55 +0000 (12:11 +0200)
commit5a81ed13ea86c1c1da8283dbf5d9c6d3342a297d
treec4d8ca072e6c58d8971049065a6cd00215b29a91
parent2f884bc702df28e781e8029a5b3d67b5299564e2
Fix date-stamp regression in erc-fill-wrap

* lisp/erc/erc-fill.el (erc-fill-wrap, erc-fill-wrap-enable)
(erc-fill-wrap-disable): Add and remove `erc-stamp--insert-date-hook'
member.
(erc-fill--wrap-continued-predicate): Add function-valued variable for
modules to influence `erc-fill--wrap-continued-message-p', which was
originally introduced as part of bug#60936.
(erc-fill--wrap-rejigger-last-message): Move toward beginning of file.
(erc-fill--wrap-unmerge-on-date-stamp): New function.
(erc-fill-wrap): Use `erc-fill--wrap-continued-predicate'.  Restore
recently deleted hunk that reset the wrap marker upon seeing a date
stamp.
* test/lisp/erc/erc-scenarios-fill-wrap.el: New file.
* test/lisp/erc/resources/fill/wrap/merge-datestamp.eld: New file.

(cherry picked from commit 7aa91b299e9dd9f416a22658afed1a8edf323b30)
lisp/erc/erc-fill.el
test/lisp/erc/erc-scenarios-fill-wrap.el [new file with mode: 0644]
test/lisp/erc/resources/fill/wrap/merge-datestamp.eld [new file with mode: 0644]