master updated (48bd17923a -> a06c13db9e)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  48bd17923a (apropos-documentation): Don't try to parse .elc files
      adds  cd83bc930c ; * lisp/htmlfontify.el (hfy-exclude-file-rules): Fix 
:version.
      adds  8d7ad65665 Fix indent and font-lock for annotation_type
      adds  195afb68e3 Merge branch 'emacs-29' of 
git.savannah.gnu.org:/srv/git/emacs into emacs-29
      adds  fd77de542d ; * etc/NEWS: Fix typos.
       new  a06c13db9e Merge from origin/emacs-29


Summary of changes:
 etc/NEWS.29                    | 3 +--
 lisp/htmlfontify.el            | 2 +-
 lisp/progmodes/java-ts-mode.el | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)