emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 c2d95dd00e6: Remove nullptr named node from c++-ts-mode (bug#64


From: Theodor Thornhill
Subject: emacs-29 c2d95dd00e6: Remove nullptr named node from c++-ts-mode (bug#64818)
Date: Mon, 24 Jul 2023 14:21:53 -0400 (EDT)

branch: emacs-29
commit c2d95dd00e6cb0abaf4e7550f38c8c2c9ca22f2d
Author: Theodor Thornhill <theo@thornhill.no>
Commit: Theodor Thornhill <theo@thornhill.no>

    Remove nullptr named node from c++-ts-mode (bug#64818)
    
    The nullptr node was changed from a named node to an unnamed node
    upstream[0], which caused font locking to break. As this is a small
    enough regression, no compat code is required.
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Remove
    node no longer in use.
    
    [0]:
    
https://github.com/tree-sitter/tree-sitter-c/commit/c75868f8b508ae32a0c8490da91bb31b2b96430e
---
 lisp/progmodes/c-ts-mode.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 7f4f6f11387..98797bf3ce7 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -574,9 +574,7 @@ MODE is either `c' or `cpp'."
    :feature 'constant
    `((true) @font-lock-constant-face
      (false) @font-lock-constant-face
-     (null) @font-lock-constant-face
-     ,@(when (eq mode 'cpp)
-         '((nullptr) @font-lock-constant-face)))
+     (null) @font-lock-constant-face)
 
    :language mode
    :feature 'keyword



reply via email to

[Prev in Thread] Current Thread [Next in Thread]