Eli Zaretskii writes: >> From: Theodor Thornhill >> Cc: casouri@gmail.com, jostein@secure.kjonigsen.net, 59691@debbugs.gnu.org, >> jostein@kjonigsen.net >> Date: Thu, 01 Dec 2022 07:01:55 +0100 >> >> diff --git a/etc/NEWS b/etc/NEWS >> index 4e091a5fed..439d20960b 100644 >> --- a/etc/NEWS >> +++ b/etc/NEWS >> @@ -2972,7 +2972,12 @@ A major mode based on the tree-sitter library for editing programs >> in the TypeScript language. It includes support for font-locking, >> indentation, and navigation. >> >> -** New major mode 'c-ts-mode'. >> +** New mode 'tsx-ts-mode'. >> +A major mode based on the tree-sitter library for editing programs >> +in the TypeScript language, with support for TSX. It includes >> +support for font-locking, indentation, and navigation. >> + >> +** New mode 'c-ts-mode'. > > Looks like some "git merge" snafu? You are in fact reverting a change I > made in NEWS yesterday. > You're right - I think I fixed it now. >> diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el >> index 6c926a4e3e..c1beaf3134 100644 >> --- a/lisp/progmodes/typescript-ts-mode.el >> +++ b/lisp/progmodes/typescript-ts-mode.el > > I don't see a change to auto-mode-alist to turn on each mode for the files > it supports? I thought this was the idea? Or is this because we don't want > tree-sitter based modes to be turned on by default? In that case, how do we > explain to users that they should use each mode in the relevant cases? I think there should be ;;;###autoload (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode)) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-ts-mode)) No? If not, then I'm confused. Theo