master updated (6479e8758d9 -> deb74de4f2e)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  6479e8758d9 ; Avoid recent tar-mode.el constant mutation
       new  8623159b4ae Fix CTCP ACTION regression in erc-fill-wrap
       new  fb57b6ccb9f ; Add example buffer-display option to ERC's manual
       new  deb74de4f2e Simplify multi-frame behavior in erc-bufbar-mode


Summary of changes:
 doc/misc/erc.texi                                  |  13 +++
 etc/ERC-NEWS                                       |  93 +++++++++---------
 lisp/erc/erc-fill.el                               |   3 +-
 lisp/erc/erc-status-sidebar.el                     | 105 +++++++++++++--------
 test/lisp/erc/erc-fill-tests.el                    |  40 ++++++++
 .../erc/resources/fill/snapshots/merge-wrap-01.eld |   1 +
 6 files changed, 171 insertions(+), 84 deletions(-)
 create mode 100644 test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld