master updated (833a1f2c53 -> f6b6614c32)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  833a1f2c53 Fix thinko in last change
       new  69f578e047 Allow non-IRC line delimiters with ERC test server
       new  4a5499910a Fix CTCP regression in erc-server-PRIVMSG
       new  075d6bb410 Ensure erc-dcc-chat-setup runs in the right buffer
       new  c238f568cd Avoid mutating default value of erc-server-last-peers
       new  f6b6614c32 Add compat from GNU ELPA as a soft dependency in ERC


Summary of changes:
 lisp/erc/erc-backend.el                            | 53 ++++++--------
 lisp/erc/erc-compat.el                             |  6 ++
 lisp/erc/erc-dcc.el                                | 40 +++++------
 lisp/erc/erc-speedbar.el                           | 24 ++-----
 lisp/erc/erc.el                                    | 38 ++++------
 test/lisp/erc/erc-scenarios-misc.el                | 39 ++++++++++
 test/lisp/erc/erc-tests.el                         | 82 ++++++++++++++++++++++
 test/lisp/erc/resources/dcc/chat/accept-dcc.eld    |  3 +
 .../auth-source/foonet.eld => dcc/chat/accept.eld} | 20 +++---
 test/lisp/erc/resources/erc-d/erc-d-tests.el       | 27 +++++++
 test/lisp/erc/resources/erc-d/erc-d.el             | 68 ++++++++++--------
 .../lisp/erc/resources/erc-d/resources/foreign.eld |  5 ++
 12 files changed, 269 insertions(+), 136 deletions(-)
 create mode 100644 test/lisp/erc/resources/dcc/chat/accept-dcc.eld
 copy test/lisp/erc/resources/{base/auth-source/foonet.eld => 
dcc/chat/accept.eld} (69%)
 create mode 100644 test/lisp/erc/resources/erc-d/resources/foreign.eld