1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

; Fix merge error

This commit is contained in:
Stefan Kangas 2022-12-14 00:12:52 +01:00
parent 8036739c1b
commit f8bc26a3db
2 changed files with 10 additions and 5 deletions

View File

@ -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

View File

@ -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