From 64fbed1027d32f6ae965675d9d1b4356dc07ef69 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 3 Jun 2025 18:41:01 +0300 Subject: [PATCH] Restore c-ts-common-comment-setup in js-ts-mode and typescript-ts-mode. * lisp/progmodes/js.el (js-ts-mode): * lisp/progmodes/typescript-ts-mode.el (typescript-ts-base-mode): Add 'c-ts-common-comment-setup' back removed in 8bccccedb65a since it does more than setting comment variables (bug#78680). (cherry picked from commit 6b668c2213432db04d29d36b8bf25a8f3f853c62) --- lisp/progmodes/js.el | 1 + lisp/progmodes/typescript-ts-mode.el | 1 + 2 files changed, 2 insertions(+) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 312310bd915..cc09c92f49b 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -4060,6 +4060,7 @@ See `treesit-thing-settings' for more information.") ;; Which-func. (setq-local which-func-imenu-joiner-function #'js--which-func-joiner) ;; Comment. + (c-ts-common-comment-setup) (setq-local comment-setup-function #'js--treesit-comment-setup) (setq-local comment-multi-line t) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index c8efb4f771a..e207b75f95e 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -661,6 +661,7 @@ This mode is intended to be inherited by concrete major modes." :syntax-table typescript-ts-mode--syntax-table ;; Comments. + (c-ts-common-comment-setup) (setq-local comment-setup-function #'js--treesit-comment-setup) ;; Electric -- 2.39.5