From f8bc26a3db7b965ab5993c20489586c16dd7992c Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 14 Dec 2022 00:12:52 +0100 Subject: [PATCH] ; Fix merge error --- etc/NEWS | 5 ----- etc/NEWS.29 | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 457a3516349..8f6c67a3cb1 100644 --- 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. - * Incompatible Lisp Changes in Emacs 30.1 diff --git a/etc/NEWS.29 b/etc/NEWS.29 index e4a19e29869..6cb531cd0f1 100644 --- 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. + * Incompatible Lisp Changes in Emacs 29.1 -- 2.39.2