master updated (278a6e1916c -> d2ce30afdd2)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  278a6e1916c Refactor pseudovector printing
       new  0a6d0a4959a Simplify option erc-fill-wrap-merge-indicator
       new  d2ce30afdd2 ; Mark test for erc--update-channel-modes as :unstable


Summary of changes:
 lisp/erc/erc-fill.el                               | 94 +++++++++++++++-------
 test/lisp/erc/erc-scenarios-auth-source.el         |  2 +-
 test/lisp/erc/erc-scenarios-base-buffer-display.el |  2 +-
 test/lisp/erc/erc-scenarios-base-renick.el         |  2 +-
 test/lisp/erc/erc-scenarios-misc.el                |  2 +-
 test/lisp/erc/erc-tests.el                         |  2 +
 .../resources/base/reuse-buffers/server/barnet.eld |  6 +-
 .../resources/base/reuse-buffers/server/foonet.eld |  6 +-
 8 files changed, 76 insertions(+), 40 deletions(-)