From a9b28224af0f73d1fe0f422e9b318c5b91af889b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 30 Jul 2023 02:11:49 -0400 Subject: [PATCH] ; Last-minute changes befor releasing 29.1 * ChangeLog.4: * etc/HISTORY: Update. --- ChangeLog.4 | 46 ++++++++++++++++++++++++++++++++++++++++++++-- etc/HISTORY | 2 +- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ChangeLog.4 b/ChangeLog.4 index d8f7fc4a579..9d64446d68e 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -1,7 +1,49 @@ -2023-07-29 Eli Zaretskii +2023-07-30 Eli Zaretskii * Version 29.1 released. +2023-07-29 Vincenzo Pupillo + + Update CMake support due to upstream changes (bug#64922) + + A recent change in tree-sitter-cmake grammar support for CMake (commit + fe9b5e0), now put arguments are wrapped in a new argument_list node. + To support the old and new version of the grammar, a new function was + added on which string syntax highlighting now depends. + + * lisp/progmodes/cmake-ts-mode.el + (cmake-ts-mode--font-lock-compatibility-fe9b5e0): Indent helper + function to handle different tree-sitter-cmake version. + * lisp/progmodes/cmake-ts-mode.el + (cmake-ts-mode--font-lock-settings): Use the new function to handle + the new argument_list node. + +2023-07-24 Theodor Thornhill + + 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 + +2023-07-24 Theodor Thornhill + + Make compat check also check typescript + + * lisp/progmodes/typescript-ts-mode.el + (tsx-ts-mode--font-lock-compatibility-bb1f97b): + Add argument so that we run the 'treesit-query-capture' when the + language is 'typescript', not only 'tsx'. + + * lisp/progmodes/typescript-ts-mode.el + (typescript-ts-mode--font-lock-settings): Use supplied argument. + 2023-07-23 Eli Zaretskii Bump Emacs version @@ -117338,7 +117380,7 @@ This file records repository revisions from commit f2ae39829812098d8269eafbc0fcb98959ee5bb7 (exclusive) to -commit 76a142e265df742b2fdd3d220607a46fcbc30e1a (inclusive). +commit 7d1737071fba1fd83039aac34f34f6b90c9579b8 (inclusive). See ChangeLog.3 for earlier changes. ;; Local Variables: diff --git a/etc/HISTORY b/etc/HISTORY index 30ad1b8f51b..70f8669cb29 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -230,7 +230,7 @@ GNU Emacs 28.2 (2022-09-12) emacs-28.2 GNU Emacs 28.3 (2023-02-17) emacs-28.3 (was not actually released) -GNU Emacs 29.1 (2023-07-29) emacs-29.1 +GNU Emacs 29.1 (2023-07-30) emacs-29.1 ---------------------------------------------------------------------- -- 2.39.2