master updated (0b5e2ce7612 -> f99a0dae7ca)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  0b5e2ce7612 ; Fix last change in the FAQ
       new  fb578ddfb25 Really fix off-by-one in erc--get-inserted-msg-bounds
       new  f7c7f7ac20d Don't over-truncate erc-timestamp-format-left
       new  781f950edab Preserve user markers when inserting ERC date stamps
       new  4c851085769 Decouple disparate escape-hatch concerns in erc-stamp
       new  f99a0dae7ca Align date stamps to whole days in ERC


Summary of changes:
 lisp/erc/erc-stamp.el                              | 171 ++++++++++++++-------
 lisp/erc/erc.el                                    |  16 +-
 test/lisp/erc/erc-fill-tests.el                    |  15 +-
 test/lisp/erc/erc-scenarios-stamp.el               |  65 ++++++++
 test/lisp/erc/erc-tests.el                         |  49 ++++++
 .../erc/resources/base/local-modules/second.eld    |   2 +-
 .../erc/resources/base/local-modules/third.eld     |   2 +-
 .../resources/fill/snapshots/merge-01-start.eld    |   2 +-
 .../resources/fill/snapshots/merge-02-right.eld    |   2 +-
 .../erc/resources/fill/snapshots/merge-wrap-01.eld |   2 +-
 10 files changed, 260 insertions(+), 66 deletions(-)