From: Yuan Fu <casouri@gmail.com>
Date: Thu, 9 May 2024 03:50:24 +0000 (-0700)
Subject: Fix #if defined directive fontification in c-ts-mode
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51a077dcfc9503e88e101d9d7dc191cb8d6d0990;p=emacs.git

Fix #if defined directive fontification in c-ts-mode

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fontify
each part separately so the identifier isn't overriden.

(cherry picked from commit 80ba6b7b96aad3659675b76a8965788fd0d73476)
---

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index a81b9e09091..09b2963abd1 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -617,8 +617,11 @@ MODE is either `c' or `cpp'."
      (preproc_params
       (identifier) @font-lock-variable-name-face)
 
-     (preproc_defined) @font-lock-preprocessor-face
-     (preproc_defined (identifier) @font-lock-variable-name-face)
+     (preproc_defined
+      "defined" @font-lock-preprocessor-face
+      "(" @font-lock-preprocessor-face
+      (identifier) @font-lock-variable-name-face
+      ")" @font-lock-preprocessor-face)
      [,@c-ts-mode--preproc-keywords] @font-lock-preprocessor-face)
 
    :language mode