]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 28 Oct 2023 08:56:22 +0000 (04:56 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 28 Oct 2023 08:56:22 +0000 (04:56 -0400)
5f60913208f Fix State button for customize-icon (Bug#66635)
27c71979ff1 ; Another Texinfo fix
889a550ca08 ; Fix Texinfo warnings
893c344b4e4 Fix the use of adaptive-fill-regexp in treesit indent preset
1098c114b74 Fix treesit-install-language-grammar (bug#66673)
491ee428c08 Fix treesit-explore-mode (bug#66431)
ee043a2703d tsx-ts-mode--font-lock-compatibility-bb1f97b: Re-fix the ...

1  2 
doc/misc/efaq.texi
doc/misc/octave-mode.texi
lisp/cus-edit.el
lisp/progmodes/typescript-ts-mode.el
lisp/treesit.el

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/treesit.el
Simple merge