master a06c13db9e: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit a06c13db9eee0487975177089b44198dd08206be
Merge: 48bd17923a fd77de542d
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    fd77de542d8 ; * etc/NEWS: Fix typos.
    195afb68e31 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
    cd83bc930ca ; * lisp/htmlfontify.el (hfy-exclude-file-rules): Fix :ve...
    8d7ad656658 Fix indent and font-lock for annotation_type
    
    # Conflicts:
    #       etc/NEWS
---
 etc/NEWS.29                    | 3 +--
 lisp/htmlfontify.el            | 2 +-
 lisp/progmodes/java-ts-mode.el | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index a9392ba627..ac338da71e 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -1645,12 +1645,11 @@ when using MuPDF as the converter for PDF files, which 
generally leads
 to sharper images (especially when zooming), and allows customization
 of background and foreground color of the page via the new user
 options 'doc-view-svg-background' and 'doc-view-svg-foreground'.  To
-activate this behaviour, set 'doc-view-mupdf-use-svg' to non-nil if
+activate this behavior, set 'doc-view-mupdf-use-svg' to non-nil if
 your Emacs has SVG support.  Note that, with some versions of MuPDF,
 SVG generation is known to sometimes produce SVG files that are buggy
 or can take a long time to render.
 
-
 ** Enriched Mode
 
 +++
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 0e3b48470d..0959405081 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -380,7 +380,7 @@ otherwise."
   "Define some regular expressions to exclude files"
   :tag "exclude-rules"
   :type '(list string)
-  :version 29.1)
+  :version "29.1")
 
 (defcustom hfy-display-class nil
   "Display class to use to determine which display class to use when
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index f1da330f1e..5f4c1275f6 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -78,6 +78,7 @@
      ((parent-is "comment") prev-adaptive-prefix 0)
      ((parent-is "text_block") no-indent)
      ((parent-is "class_body") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "annotation_type_body") parent-bol java-ts-mode-indent-offset)
      ((parent-is "interface_body") parent-bol java-ts-mode-indent-offset)
      ((parent-is "constructor_body") parent-bol java-ts-mode-indent-offset)
      ((parent-is "enum_body") parent-bol java-ts-mode-indent-offset)
@@ -225,7 +226,10 @@
    :language 'java
    :override t
    :feature 'definition
-   `((method_declaration
+   `((annotation_type_element_declaration
+      name: (identifier) @font-lock-function-name-face)
+
+     (method_declaration
       name: (identifier) @font-lock-function-name-face)
 
      (variable_declarator