master updated (64a4904353f -> 8e06f224a9e)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  64a4904353f Merge remote-tracking branch 'savannah/master' into 
master-android-1
       new  7c2e02e6d79 Remove module from suggested lineup in ERC's manual
       new  b5da8ba8070 Define ERC message-formatting templates with defvar
       new  61b22ae9f37 Sequester some special-variable declarations in ERC
       new  1e2b156f040 Double hyphenate internal ERC 5.6 text props
       new  69ca2cc1138 Add utility for iterating over arrays in ERC
       new  951b115c2ac Make erc-input's refoldp slot conditionally available
       new  4ee4865ce20 Add erc-server-396 response handler
       new  11bae96d23b Clarify warning for process-dependent input in ERC
       new  7db500b50be Make erc-get-user-mode-prefix more flexible
       new  c1befaf0a8b Skip erc-ignored-user-p when erc-ignore-list is empty
       new  236a416be76 Add erc--spkr text property to chat messages
       new  49bfea4386f Use templates for formatting chat messages in ERC
       new  9d961b31070 Demote erc-fill-line-spacing to a normal variable
       new  6e4417eaa7e Consolidate status-prefix slots of erc-channel-user
       new  08ec3e89793 Rename erc-channel-users to erc-channel-members
       new  741bce84890 Forgo excess nick buttonizing on JOINs and QUITs
       new  9d889af0d68 Promote "normal" faces in erc-track
       new  0f058244ab7 Cache shortened channel names in erc-track
       new  8e06f224a9e Add erc-track integration to erc-nicks


Summary of changes:
 doc/misc/erc.texi                                  |  46 +-
 etc/ERC-NEWS                                       | 153 +++-
 lisp/erc/erc-backend.el                            | 188 +++--
 lisp/erc/erc-button.el                             |  80 +-
 lisp/erc/erc-common.el                             | 109 ++-
 lisp/erc/erc-dcc.el                                |  15 +-
 lisp/erc/erc-fill.el                               | 149 ++--
 lisp/erc/erc-goodies.el                            |   2 +-
 lisp/erc/erc-netsplit.el                           |  13 +-
 lisp/erc/erc-networks.el                           |  23 +-
 lisp/erc/erc-nicks.el                              |  92 ++-
 lisp/erc/erc-notify.el                             |  81 +-
 lisp/erc/erc-page.el                               |   3 +-
 lisp/erc/erc-sasl.el                               |   5 +-
 lisp/erc/erc-sound.el                              |   3 +-
 lisp/erc/erc-speedbar.el                           |   4 +-
 lisp/erc/erc-stamp.el                              |  27 +-
 lisp/erc/erc-track.el                              | 270 ++++++-
 lisp/erc/erc.el                                    | 819 +++++++++++++++------
 test/lisp/erc/erc-fill-tests.el                    |  11 +-
 test/lisp/erc/erc-nicks-tests.el                   |   2 +-
 test/lisp/erc/erc-scenarios-base-reconnect.el      |   2 +-
 test/lisp/erc/erc-scenarios-base-renick.el         |   2 +-
 test/lisp/erc/erc-scenarios-base-statusmsg.el      | 103 +++
 test/lisp/erc/erc-scenarios-display-message.el     |   4 +-
 test/lisp/erc/erc-scenarios-match.el               |  14 +-
 test/lisp/erc/erc-scenarios-misc-commands.el       |  32 +
 test/lisp/erc/erc-scenarios-stamp.el               |  20 +-
 test/lisp/erc/erc-stamp-tests.el                   |   2 +-
 test/lisp/erc/erc-tests.el                         | 478 ++++++++++--
 test/lisp/erc/erc-track-tests.el                   | 166 +++++
 .../resources/base/display-message/statusmsg.eld   |  47 ++
 .../reconnect/options.eld => commands/vhost.eld}   |  15 +-
 .../resources/fill/snapshots/merge-01-start.eld    |   2 +-
 .../resources/fill/snapshots/merge-02-right.eld    |   2 +-
 .../erc/resources/fill/snapshots/merge-wrap-01.eld |   2 +-
 .../snapshots/merge-wrap-indicator-post-01.eld     |   2 +-
 .../fill/snapshots/merge-wrap-indicator-pre-01.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 +-
 .../resources/fill/snapshots/stamps-left-01.eld    |   2 +-
 .../erc/resources/join/network-id/foonet-again.eld |   2 +-
 45 files changed, 2381 insertions(+), 623 deletions(-)
 create mode 100644 test/lisp/erc/erc-scenarios-base-statusmsg.el
 create mode 100644 test/lisp/erc/resources/base/display-message/statusmsg.eld
 copy test/lisp/erc/resources/{base/reconnect/options.eld => 
commands/vhost.eld} (73%)