master updated (13182ae9768 -> 5fb9d6c5e72)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  13182ae9768 ; * src/xdisp.c (draw_glyphs): Fix coding style.
       new  717f917d1de ; Fix some doc strings in ERC
       new  23d692ed014 Populate erc--msg-prop-overrides for CTCP replies
       new  34fe0b5c87c Replace some uses of erc-error
       new  9cd47017c70 Fix overlapping logs from erc-truncate-buffer-on-save
       new  5fb9d6c5e72 Optionally continue on error in erc-auth-source-search


Summary of changes:
 doc/misc/erc.texi                             | 33 +++++++++++--
 lisp/erc/erc-backend.el                       | 53 +++++++++-----------
 lisp/erc/erc-button.el                        | 11 +++--
 lisp/erc/erc-log.el                           |  5 +-
 lisp/erc/erc-networks.el                      |  2 -
 lisp/erc/erc-sasl.el                          |  9 ++--
 lisp/erc/erc-speedbar.el                      | 39 ++++++++-------
 lisp/erc/erc-stamp.el                         |  7 +--
 lisp/erc/erc-status-sidebar.el                | 13 ++---
 lisp/erc/erc.el                               | 71 ++++++++++++++++++++-------
 test/lisp/erc/erc-scenarios-log.el            | 55 +++++++++++++++++++++
 test/lisp/erc/erc-scenarios-sasl.el           | 34 +++++++------
 test/lisp/erc/erc-scenarios-status-sidebar.el |  3 +-
 test/lisp/erc/erc-tests.el                    |  2 +-
 test/lisp/erc/resources/sasl/plain-failed.eld | 10 ++--
 15 files changed, 233 insertions(+), 114 deletions(-)