master updated (c96c8a9a7d2 -> 867b1040107)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  c96c8a9a7d2 ; * lisp/vc/ediff-diff.el (ediff-auto-refine): Fix last 
change.
       new  38706abdf7f Add helper for restoring local session vars in ERC
       new  75a412d78b6 Optionally add spacing between ERC messages
       new  867b1040107 Make some module toggles more resilient in ERC


Summary of changes:
 etc/ERC-NEWS                                       |   7 +
 lisp/erc/erc-common.el                             |   4 +-
 lisp/erc/erc-fill.el                               | 163 ++++++++++-----------
 lisp/erc/erc-goodies.el                            |  34 ++---
 lisp/erc/erc-imenu.el                              |   5 +-
 lisp/erc/erc-match.el                              |   2 +
 lisp/erc/erc-sasl.el                               |  38 ++---
 lisp/erc/erc-spelling.el                           |   5 +-
 lisp/erc/erc-stamp.el                              |  10 +-
 lisp/erc/erc.el                                    |  83 ++++++++++-
 test/lisp/erc/erc-fill-tests.el                    |  24 ++-
 test/lisp/erc/erc-goodies-tests.el                 |  17 +--
 test/lisp/erc/erc-tests.el                         |  15 ++
 .../resources/fill/snapshots/spacing-01-mono.eld   |   1 +
 14 files changed, 259 insertions(+), 149 deletions(-)
 create mode 100644 test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld