master updated (0f04aa06a69 -> a46789b56af)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  0f04aa06a69 (describe-package-1): Fix bug#69712
       new  44be4fa8e65 Remove unused faces from various erc-goodies tests
       new  525bc083155 Remove mishandled erc-control-default-{fg,bg} faces
       new  b9bd78f78d6 Restore leading space to right-margin stamps in ERC
       new  a46789b56af Reuse command-indicator code for script lines in ERC


Summary of changes:
 lisp/erc/erc-goodies.el                            |  58 ++++++++--
 lisp/erc/erc-stamp.el                              |   1 +
 lisp/erc/erc.el                                    |  58 +++-------
 test/lisp/erc/erc-goodies-tests.el                 | 127 +++++++++++++++++++--
 test/lisp/erc/erc-stamp-tests.el                   |  16 +--
 .../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 +-
 .../snapshots/merge-wrap-indicator-post-01.eld     |   2 +-
 .../fill/snapshots/merge-wrap-indicator-pre-01.eld |   2 +-
 .../fill/snapshots/monospace-01-start.eld          |   2 +-
 .../fill/snapshots/monospace-02-right.eld          |   2 +-
 .../resources/fill/snapshots/monospace-03-left.eld |   2 +-
 .../fill/snapshots/monospace-04-reset.eld          |   2 +-
 .../resources/fill/snapshots/spacing-01-mono.eld   |   2 +-
 15 files changed, 196 insertions(+), 84 deletions(-)