master updated (b5df39e924b -> 617ddb80899)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  b5df39e924b ; * .mailmap: Update some entries.
       new  c96a626dce2 Allow login to contain NUH delimiters in erc-parse-user
       new  e1b8dbe9eaa ; Allow alternate ert-info text in ERC test utility
       new  7c932fa3078 Add optional timezone param to erc-echo-timestamp
       new  617ddb80899 Consider all windows in erc-scrolltobottom-mode


Summary of changes:
 etc/ERC-NEWS                                       |  33 ++-
 lisp/erc/erc-backend.el                            |   2 +-
 lisp/erc/erc-goodies.el                            | 274 +++++++++++++++++++--
 lisp/erc/erc-stamp.el                              | 101 ++++++--
 lisp/erc/erc.el                                    |  12 +-
 .../erc/erc-scenarios-scrolltobottom-relaxed.el    | 140 +++++++++++
 test/lisp/erc/erc-scenarios-scrolltobottom.el      |  66 +++++
 test/lisp/erc/erc-stamp-tests.el                   |  30 +++
 test/lisp/erc/erc-tests.el                         |  36 ++-
 .../base/assoc/bouncer-history/barnet.eld          |   4 +-
 .../base/assoc/bouncer-history/foonet.eld          |   4 +-
 .../lisp/erc/resources/base/assoc/bumped/again.eld |  10 +-
 .../erc/resources/base/assoc/bumped/foisted.eld    |  10 +-
 .../erc/resources/base/assoc/bumped/refoisted.eld  |   8 +-
 test/lisp/erc/resources/base/flood/soju.eld        |   2 +-
 .../erc/resources/base/netid/bouncer/barnet.eld    |   2 +-
 .../erc/resources/base/netid/bouncer/foonet.eld    |   2 +-
 .../erc/resources/base/reconnect/aborted-dupe.eld  |   2 +-
 test/lisp/erc/resources/base/reconnect/aborted.eld |   2 +-
 .../resources/base/renick/self/qual-chester.eld    |   2 +-
 .../erc/resources/base/renick/self/qual-tester.eld |   2 +-
 test/lisp/erc/resources/erc-d/erc-d-t.el           |   7 +-
 test/lisp/erc/resources/erc-d/erc-d-u.el           |   1 +
 test/lisp/erc/resources/erc-d/erc-d.el             |   2 +-
 .../resources/erc-d/resources/dynamic-barnet.eld   |   4 +-
 .../resources/erc-d/resources/dynamic-foonet.eld   |   2 +-
 test/lisp/erc/resources/erc-d/resources/linger.eld |   4 +-
 test/lisp/erc/resources/erc-scenarios-common.el    | 205 +++++++++++++++
 test/lisp/erc/resources/join/legacy/foonet.eld     |   2 +-
 test/lisp/erc/resources/scrolltobottom/help.eld    |  46 ++++
 30 files changed, 930 insertions(+), 87 deletions(-)
 create mode 100644 test/lisp/erc/erc-scenarios-scrolltobottom-relaxed.el
 create mode 100644 test/lisp/erc/erc-scenarios-scrolltobottom.el
 create mode 100644 test/lisp/erc/resources/scrolltobottom/help.eld