]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Mon, 31 Jul 2023 15:11:23 +0000 (11:11 -0400)
committerEli Zaretskii <eliz@gnu.org>
Mon, 31 Jul 2023 15:11:23 +0000 (11:11 -0400)
a9b28224af0 ; Last-minute changes befor releasing 29.1
7da1cee56b3 Update CMake support due to upstream changes (bug#64922)
c2d95dd00e6 Remove nullptr named node from c++-ts-mode (bug#64818)
4e977136d31 Make compat check also check typescript
906ecf442c4 ; * etc/HISTORY: Fix the 28.3 entry.

1  2 
lisp/progmodes/c-ts-mode.el
lisp/progmodes/typescript-ts-mode.el

Simple merge
Simple merge