master updated (b6d48190609 -> edfbdb3f165)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  b6d48190609 Adapt emba integration
       new  a4df7483295 Prefer emacs-news-mode in etc/ERC-NEWS
       new  ac80e377830 ; * doc/misc/erc.texi: Fix reconnecting in SOCKS 
example.
       new  0f76bed4928 ; * lisp/erc/erc.el (erc-send-input-line-function): Doc.
       new  bd969326e96 Add alias erc-buffer-do for erc-buffer-filter
       new  67f7ac2bbee Deprecate nicknames entry in erc-button-alist
       new  e560f9af8e8 Allow ERC modules to extend erc-nick-popup-alist
       new  1c3f6aa98f5 Measure stamps pixel-wise with erc-fill-wrap
       new  d880a08f959 Cement ordering of essential hook members in ERC
       new  2daa71f9329 Don't insert prompt input before markers in ERC
       new  56e1922281d Revert "Add hook to regain nickname in ERC"
       new  edfbdb3f165 Define missing groups for ERC modules


Summary of changes:
 doc/misc/erc.texi                                  |  27 ++-
 etc/ERC-NEWS                                       |  50 ++++-
 lisp/erc/erc-backend.el                            |   4 +-
 lisp/erc/erc-button.el                             | 203 +++++++++++++--------
 lisp/erc/erc-dcc.el                                |   3 +-
 lisp/erc/erc-fill.el                               |  33 ++--
 lisp/erc/erc-goodies.el                            |   6 +-
 lisp/erc/erc-imenu.el                              |   6 +-
 lisp/erc/erc-match.el                              |   4 +-
 lisp/erc/erc-sound.el                              |   8 +-
 lisp/erc/erc-spelling.el                           |   4 +
 lisp/erc/erc-stamp.el                              |   6 +-
 lisp/erc/erc.el                                    | 126 +++++--------
 test/lisp/erc/erc-dcc-tests.el                     |  10 +-
 test/lisp/erc/erc-fill-tests.el                    |   6 +-
 test/lisp/erc/erc-networks-tests.el                |  24 +--
 test/lisp/erc/erc-scenarios-base-renick.el         |  43 -----
 test/lisp/erc/erc-stamp-tests.el                   |   7 +-
 test/lisp/erc/erc-tests.el                         | 144 +++++++++------
 .../resources/base/renick/regain/normal-again.eld  |  56 ------
 .../erc/resources/base/renick/regain/normal.eld    |  53 ------
 .../resources/fill/snapshots/merge-01-start.eld    |   2 +-
 .../resources/fill/snapshots/merge-02-right.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 +-
 28 files changed, 395 insertions(+), 442 deletions(-)
 delete mode 100644 test/lisp/erc/resources/base/renick/regain/normal-again.eld
 delete mode 100644 test/lisp/erc/resources/base/renick/regain/normal.eld