From: Eli Zaretskii Date: Sat, 13 Jul 2024 10:16:42 +0000 (+0300) Subject: ; Fix last change X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9efc9e07dcf77676434f8cda62f63379f7223637;p=emacs.git ; Fix last change * lisp/progmodes/java-ts-mode.el (java-ts-mode): * lisp/progmodes/c-ts-mode.el (c-ts-mode, c++-ts-mode): Load the Doxygen grammar quietly, so that if it isn't available, the user is not annoyed. (Bug#71874) (cherry picked from commit 3a26a51c69b064546fd4647a94cdfc2656b201ec) --- diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index e989f44f588..b2fe847d306 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -1351,7 +1351,7 @@ in your init files." (treesit-font-lock-recompute-features '(emacs-devel))) ;; Inject doxygen parser for comment. - (when (treesit-ready-p 'doxygen) + (when (treesit-ready-p 'doxygen t) (setq-local treesit-primary-parser primary-parser) (setq-local treesit-font-lock-settings (append @@ -1412,7 +1412,7 @@ recommended to enable `electric-pair-mode' with this mode." #'c-ts-mode--emacs-current-defun-name)) ;; Inject doxygen parser for comment. - (when (treesit-ready-p 'doxygen) + (when (treesit-ready-p 'doxygen t) (setq-local treesit-primary-parser primary-parser) (setq-local treesit-font-lock-settings (append diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index 68ead567632..ac104534734 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -401,7 +401,7 @@ Return nil if there is no name or if NODE is not a defun node." java-ts-mode--font-lock-settings) ;; Inject doxygen parser for comment. - (when (treesit-ready-p 'doxygen) + (when (treesit-ready-p 'doxygen t) (setq-local treesit-primary-parser primary-parser) (setq-local treesit-font-lock-settings (append treesit-font-lock-settings