aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorF. Jason Park2023-07-02 20:57:46 -0700
committerF. Jason Park2023-07-03 07:30:32 -0700
commitd0325e23099823f9f6e2575ef52940a69e8a6549 (patch)
treeba5ac2ab64c073dd97aad1fb681643256080b754 /java
parent14ae2101412d66576846d30ab32b4d5b0081383d (diff)
downloademacs-d0325e23099823f9f6e2575ef52940a69e8a6549.tar.gz
emacs-d0325e23099823f9f6e2575ef52940a69e8a6549.zip
Revert "Account for leading timestamps in erc-match"
This reverts commit 99d74dcd45938e2686d93eb5649800e14a88cd84 but keeps the test file test/lisp/erc/erc-scenarios-match.el. It also implements a partial alternative solution by undoing the reordering of insert hooks owned by the `stamp' and `match' modules. The initial reordering stems from d880a08f "Cement ordering of essential hook members in ERC" and was intended to address the problem of timestamps not being hidden in matched "fool" messages. However, a more comprehensive solution is being pursued as part of bug#64301. The following changes differ from those in a pure revert. * erc/ERC-NEWS: Fix erroneous claim about relative hook ordering pre-5.6. * lisp/erc/erc-match.el (erc-match-mode, erc-match-enable): Lower hook depth of `erc-match-message' in `erc-insert-modify-hook' from 60 to 50. (erc-text-matched-hook): Retain cleaned-up portion of revised doc string instead of reverting completely. * lisp/erc/erc-stamp.el (erc-stamp-mode, erc-stamp-enable): Raise depth of `erc-add-timestamp' in `erc-insert-modify-hook' and `erc-send-modify-hook' from 50 to 60. * test/lisp/erc/erc-scenarios-match.el (erc-scenarios-match--stamp-left-current-nick erc-scenarios-match--stamp-left-fools-invisible): Temporarily disable the latter and fix expected hook ordering. * test/lisp/erc/erc-tests.el (erc--essential-hook-ordering): Fix expected order of default insert hooks. (Bug#60936)
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions