From: Stefan Kangas Date: Fri, 16 Dec 2022 07:47:27 +0000 (+0100) Subject: ; Fix merge errors X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4331771222fe670bd45c460b5e4f68e0dd4dc3c1;p=emacs.git ; Fix merge errors --- diff --git a/etc/NEWS b/etc/NEWS index 4efa75fce21..af7f1050b76 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -99,14 +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 'go-ts-mode'. -A major mode based on the tree-sitter library for editing programs in -the Go language. It is auto-enabled for files with the ".go" extension. - -*** New major mode 'go-mod-ts-mode'. -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". - * Lisp Changes in Emacs 30.1 diff --git a/etc/NEWS.29 b/etc/NEWS.29 index 701e414fdbb..dd11b3c2715 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -3081,6 +3081,14 @@ A major mode based on the tree-sitter library for editing files written in TOML, a format for writing configuration files. It is auto-enabled for files with the ".toml" extension. +*** New major mode 'go-ts-mode'. +A major mode based on the tree-sitter library for editing programs in +the Go language. It is auto-enabled for files with the ".go" extension. + +*** New major mode 'go-mod-ts-mode'. +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". + * Incompatible Lisp Changes in Emacs 29.1