master updated (2fca889cfb4 -> 2ed9c9f1b32)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  2fca889cfb4 CC Mode: Fontify int unsigned Foo;
       new  5bc84a0c9e4 Cache UI string for channel modes in ERC
       new  4064985b807 Fix speedbar help-echo in erc-nickbar-mode
       new  3c9cba9df3d Don't inherit properties when refreshing ERC's prompt
       new  0d6c8d41ab7 Use overlay instead of text prop to hide ERC's prompt
       new  8bb68a522f3 Optionally align prompt to prefix in erc-fill-wrap
       new  7cbe6ae7124 Add merged-message indicator option for erc-fill-wrap
       new  2ed9c9f1b32 Optionally allow substitution patterns in erc-prompt


Summary of changes:
 etc/ERC-NEWS                                       |  19 ++
 lisp/erc/erc-backend.el                            |  21 +-
 lisp/erc/erc-common.el                             |   3 +-
 lisp/erc/erc-compat.el                             |  20 ++
 lisp/erc/erc-fill.el                               | 140 +++++++++-
 lisp/erc/erc-speedbar.el                           |  53 ++--
 lisp/erc/erc-stamp.el                              |  38 ++-
 lisp/erc/erc.el                                    | 310 ++++++++++++++++++---
 test/lisp/erc/erc-fill-tests.el                    |  21 +-
 ...han-modes.el => erc-scenarios-prompt-format.el} |  69 +++--
 test/lisp/erc/erc-tests.el                         | 109 ++++++--
 ...rap-01.eld => merge-wrap-indicator-post-01.eld} |   2 +-
 ...wrap-01.eld => merge-wrap-indicator-pre-01.eld} |   2 +-
 13 files changed, 661 insertions(+), 146 deletions(-)
 copy test/lisp/erc/{erc-scenarios-base-chan-modes.el => 
erc-scenarios-prompt-format.el} (53%)
 copy test/lisp/erc/resources/fill/snapshots/{merge-wrap-01.eld => 
merge-wrap-indicator-post-01.eld} (77%)
 copy test/lisp/erc/resources/fill/snapshots/{merge-wrap-01.eld => 
merge-wrap-indicator-pre-01.eld} (59%)