; Fix merge error

diff --git a/etc/NEWS b/etc/NEWS
index 457a3516349e5165b5aacbaefa9246e583248776..8f6c67a3cb103d3f77f2b5940667c6008f2ab2b0 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -91,11 +91,6 @@ A major mode based on the tree-sitter library for editing
 Dockerfiles.  It includes support for font-locking, indentation, Imenu,
 and which-func.
 
-** New major mode 'cmake-ts-mode'.
-A major mode based on the tree-sitter library for editing CMake files.
-It includes support for font-locking, indentation, Imenu, and
-which-func.
-
 \f
 * Incompatible Lisp Changes in Emacs 30.1
 

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index e4a19e29869ee5bb39ec8dc1210f8ebc55dc5c86..6cb531cd0f141968a1d6d1b6dd1028e6483910de 100644 (file)
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -3068,6 +3068,16 @@ A major mode based on the tree-sitter library for editing Bash shell
 scripts.  It includes support for font-locking, indentation, Imenu,
 which-func, and navigation.
 
+** New major mode 'dockerfile-ts-mode'.
+A major mode based on the tree-sitter library for editing
+Dockerfiles.  It includes support for font-locking, indentation, Imenu,
+and which-func.
+
+** New major mode 'cmake-ts-mode'.
+A major mode based on the tree-sitter library for editing CMake files.
+It includes support for font-locking, indentation, Imenu, and
+which-func.
+
 \f
 * Incompatible Lisp Changes in Emacs 29.1