; Fix merge errors in etc/NEWS

diff --git a/etc/NEWS b/etc/NEWS
index 00f9690415681ee431be1aee81b34d4dce5059cb..af7f1050b763a0fa01abd144d384e24a2628e957 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -38,11 +38,6 @@ connection.
 \f
 * 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.
-
 \f
 * 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
 \f
 * 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.
-
 \f
 * Lisp Changes in Emacs 30.1
 

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index e1864e21174c928444a9224b0330c35b8f2c4951..017fd850b4efb5b4c976695e7b99a246d976a2c2 100644 (file)
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -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.
+
 \f
 * 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.