; Fix merge errors in etc/NEWS

This commit is contained in:
Stefan Kangas 2022-12-19 05:00:38 +01:00
parent 6c540e38f4
commit 6c842ef81c
2 changed files with 10 additions and 10 deletions

View file

@ -38,11 +38,6 @@ connection.
* Editing Changes in Emacs 30.1
---
*** New input method 'cyrillic-chuvash'.
This input method is based on the russian-computer, and is intended
for the Chuvash language written in the Cyrillic script.
* Changes in Specialized Modes and Packages in Emacs 30.1
---
@ -104,11 +99,6 @@ point is not in a comment or a string. It is by default bound to
* Incompatible Lisp Changes in Emacs 30.1
*** New major mode 'yaml-ts-mode'.
A major mode based on the tree-sitter library for editing files
written in YAML. It is auto-enabled for files with the ".yaml" or
".yml" extensions.
* Lisp Changes in Emacs 30.1

View file

@ -1411,6 +1411,11 @@ language.
This is a variant of the 'slovak' input method, which corresponds to
the QWERTY Slovak keyboards.
---
*** New input method 'cyrillic-chuvash'.
This input method is based on the russian-computer, and is intended
for the Chuvash language written in the Cyrillic script.
* Changes in Specialized Modes and Packages in Emacs 29.1
@ -3143,6 +3148,11 @@ the Go language. It is auto-enabled for files with the ".go" extension.
A major mode based on the tree-sitter library for editing "go.mod"
files. It is auto-enabled for files which are named "go.mod".
*** New major mode 'yaml-ts-mode'.
A major mode based on the tree-sitter library for editing files
written in YAML. It is auto-enabled for files with the ".yaml" or
".yml" extensions.
*** New major mode 'rust-ts-mode'.
A major mode based on the tree-sitter library for editing programs in
the Rust language. It is auto-enabled for files with the ".rs" extension.