feature/android updated (7b5d32fa871 -> 259bec95de1)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  7b5d32fa871 Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  0228421e349 Allow suppressing the "lexical arg shadows dynbound 
var" warning
      adds  4c50af02ab0 cl-macs.el: Silence recent new "lexical arg shadows" 
warnings
      adds  0ebedd0119c ; * doc/lispintro/emacs-lisp-intro.texi (car & cdr): 
Fix typo.
      adds  7220bbe0511 Correction to patch on 2023-06-21 15:36:56 +0000.
      adds  c64021d58a1 Merge remote-tracking branch 
'refs/remotes/origin/master'
      adds  d2a7b0c76d1 Revert "Allow erc-reuse-frames to favor connections"
      adds  34416e21da2 Avoid "shadows" warning from erc-button--nick slots
      adds  a6de0d22e42 ; * doc/misc/erc.texi: Mention ERC's own mailing list.
       new  259bec95de1 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 doc/lispintro/emacs-lisp-intro.texi |   2 +-
 doc/misc/erc.texi                   |   4 +-
 etc/ERC-NEWS                        |   8 -
 lisp/emacs-lisp/bytecomp.el         |   8 +
 lisp/emacs-lisp/cconv.el            |   5 -
 lisp/emacs-lisp/cl-macs.el          |  27 ++--
 lisp/erc/erc-button.el              |  12 +-
 lisp/erc/erc.el                     |  64 ++------
 lisp/progmodes/cc-engine.el         |  17 +-
 test/lisp/erc/erc-tests.el          | 303 ------------------------------------
 10 files changed, 54 insertions(+), 396 deletions(-)