feature/android updated (1cd514c297f -> 32c627a5ac3)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  1cd514c297f Improve appearance of custom dialog buttons on Android
      adds  a4df7483295 Prefer emacs-news-mode in etc/ERC-NEWS
      adds  ac80e377830 ; * doc/misc/erc.texi: Fix reconnecting in SOCKS 
example.
      adds  0f76bed4928 ; * lisp/erc/erc.el (erc-send-input-line-function): Doc.
      adds  bd969326e96 Add alias erc-buffer-do for erc-buffer-filter
      adds  67f7ac2bbee Deprecate nicknames entry in erc-button-alist
      adds  e560f9af8e8 Allow ERC modules to extend erc-nick-popup-alist
      adds  1c3f6aa98f5 Measure stamps pixel-wise with erc-fill-wrap
      adds  d880a08f959 Cement ordering of essential hook members in ERC
      adds  2daa71f9329 Don't insert prompt input before markers in ERC
      adds  56e1922281d Revert "Add hook to regain nickname in ERC"
      adds  edfbdb3f165 Define missing groups for ERC modules
      adds  560c15a04f9 ; * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): 
minor tweaks
      adds  410aac81832 * lisp/transient.el (transient--wrap-command): Use 
`letrec` and a closure
       new  32c627a5ac3 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 doc/misc/erc.texi                                  |  27 ++-
 etc/ERC-NEWS                                       |  50 ++++-
 lisp/emacs-lisp/macroexp.el                        |   6 +-
 lisp/erc/erc-backend.el                            |   4 +-
 lisp/erc/erc-button.el                             | 203 +++++++++++++--------
 lisp/erc/erc-dcc.el                                |   3 +-
 lisp/erc/erc-fill.el                               |  33 ++--
 lisp/erc/erc-goodies.el                            |   6 +-
 lisp/erc/erc-imenu.el                              |   6 +-
 lisp/erc/erc-match.el                              |   4 +-
 lisp/erc/erc-sound.el                              |   8 +-
 lisp/erc/erc-spelling.el                           |   4 +
 lisp/erc/erc-stamp.el                              |   6 +-
 lisp/erc/erc.el                                    | 126 +++++--------
 lisp/transient.el                                  |  52 +++---
 test/lisp/erc/erc-dcc-tests.el                     |  10 +-
 test/lisp/erc/erc-fill-tests.el                    |   6 +-
 test/lisp/erc/erc-networks-tests.el                |  24 +--
 test/lisp/erc/erc-scenarios-base-renick.el         |  43 -----
 test/lisp/erc/erc-stamp-tests.el                   |   7 +-
 test/lisp/erc/erc-tests.el                         | 144 +++++++++------
 .../resources/base/renick/regain/normal-again.eld  |  56 ------
 .../erc/resources/base/renick/regain/normal.eld    |  53 ------
 .../resources/fill/snapshots/merge-01-start.eld    |   2 +-
 .../resources/fill/snapshots/merge-02-right.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 +-
 30 files changed, 421 insertions(+), 474 deletions(-)
 delete mode 100644 test/lisp/erc/resources/base/renick/regain/normal-again.eld
 delete mode 100644 test/lisp/erc/resources/base/renick/regain/normal.eld