master updated (2d173aa3d34 -> 1c960bda912)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  2d173aa3d34 Fix a number of Android compilation warnings
       new  d1c670f0cbf Disable which-func-mode in erc-imenu buffers
       new  e9591fae5e7 Add command for teaching Imenu about ERC macros
       new  1c960bda912 Use smarter default for erc-server-reconnect-function


Summary of changes:
 doc/misc/erc.texi                                  | 37 +++++++---------------
 etc/ERC-NEWS                                       |  6 ++++
 lisp/erc/erc-backend.el                            | 21 ++++++++++--
 lisp/erc/erc-imenu.el                              | 35 +++++++++++++-------
 test/lisp/erc/erc-scenarios-base-auto-recon.el     |  8 +++--
 test/lisp/erc/erc-scenarios-base-buffer-display.el |  1 +
 .../erc-scenarios-base-compat-rename-bouncer.el    |  1 +
 .../erc-scenarios-base-netid-bouncer-recon-base.el |  3 +-
 .../erc-scenarios-base-netid-bouncer-recon-both.el |  4 ++-
 .../erc-scenarios-base-netid-bouncer-recon-id.el   |  6 ++--
 test/lisp/erc/erc-scenarios-base-reconnect.el      |  2 ++
 test/lisp/erc/erc-scenarios-services-misc.el       |  1 +
 test/lisp/erc/erc-scenarios-stamp.el               |  1 +
 test/lisp/erc/resources/erc-tests-common.el        | 37 ++++++++++++++++++++++
 14 files changed, 117 insertions(+), 46 deletions(-)