Merge from origin/emacs-29

f4f30ff4c44 Update to Org 9.6.1
09f7a920644 Add support for annotation_type_declaration
4a8891a462e * etc/NEWS: Mention incompatible changes in 'outline-mino...
384504edf35 Ensure VC package names are not empty
70947da708c Handle missing package description when unpacking vc pack...

# Conflicts:
#	etc/NEWS

1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 87a4e2b90f8..8d432f1774e 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -122,7 +122,8 @@
     "provides" "public" "requires" "return" "sealed"
     "static" "strictfp" "switch" "synchronized"
     "throw" "throws" "to" "transient" "transitive"
-    "try" "uses" "volatile" "while" "with" "record")
+    "try" "uses" "volatile" "while" "with" "record"
+    "@interface")
   "Java keywords for tree-sitter font-locking.")
 
 (defvar java-ts-mode--operators
@@ -183,7 +184,10 @@
    :language 'java
    :override t
    :feature 'type
-   '((interface_declaration
+   '((annotation_type_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (interface_declaration
       name: (identifier) @font-lock-type-face)
 
      (class_declaration