master updated (60240f54e5 -> 033f2cc614)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  60240f54e5 Merge from origin/emacs-29
      adds  f31e65694c Fix completion-auto-help docstring (bug#60709)
      adds  c267cd0151 ; Kill some stray buffers left behind by ERC tests
      adds  bb98666d03 ; Fix wrong type in erc-ignore hide-list options
      adds  fda1ad4a9e Remove obsolete server buffers on MOTD in erc-track
      adds  64fe6bdb61 Improve 'describe-char-fold-equivalences' docstring
      adds  136c027221 Fix reftex-citation docstring (bug#60710)
      adds  1cbc22b9c7 CC Mode: partially revert commit from 2022-10-04
       new  033f2cc614 Merge from origin/emacs-29


Summary of changes:
 lisp/char-fold.el                                  | 18 +++++++-
 lisp/erc/erc-networks.el                           |  6 +++
 lisp/erc/erc-track.el                              | 12 +++++-
 lisp/erc/erc.el                                    |  6 ++-
 lisp/minibuffer.el                                 |  2 +-
 lisp/progmodes/cc-fonts.el                         |  4 +-
 lisp/textmodes/reftex-cite.el                      |  2 +-
 test/lisp/erc/erc-scenarios-base-association.el    | 49 ++++++++++++++++++++++
 test/lisp/erc/erc-services-tests.el                |  9 ++--
 test/lisp/erc/resources/erc-d/erc-d-t.el           |  2 +-
 .../erc/resources/networks/merge-server/track.eld  | 44 +++++++++++++++++++
 11 files changed, 141 insertions(+), 13 deletions(-)
 create mode 100644 test/lisp/erc/resources/networks/merge-server/track.eld