]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Sat, 25 Feb 2023 05:30:14 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Sat, 25 Feb 2023 05:30:14 +0000 (06:30 +0100)
commit50b55656b9c5ce0d7940bec245f2d9725378d0a0
tree851e86ebecbdf9a1ae767f9242415aa29ff3ae1e
parenta129f257720dbef9adcaff58862d45ac142f93f6
parent5cf50d60041c82deccc4b32a8ecdb1a28b6e8f91
Merge from origin/emacs-29

5cf50d60041 Check the anchor along with the offset in treesit-indent-...
497018dd5c3 ; Fix typos in docstrings in c-ts-common.el
03072bbdd38 ; Set indent-tabs-mode to nil in c-ts-mode indent preproc...
4a25fa4586c Align to prev sibling for c-ts-mode indentation
d25f24fe57b Fix c-ts-common-statement-offset and c-ts-common--node-is
c92360c7a3b typescript-ts-mode: Highlight non-shorthand destructuring...
a795c51f605 Add more/finer faces for tree-sitter
146bce49321 Avoid crashes in batch mode due to lack of frame face cache
244a73cd729 Add Tramp version integrated in Emacs 28.3

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/net/trampver.el
lisp/progmodes/c-ts-mode.el
lisp/progmodes/csharp-mode.el
lisp/progmodes/go-ts-mode.el
lisp/progmodes/java-ts-mode.el
lisp/progmodes/js.el
lisp/progmodes/json-ts-mode.el
lisp/progmodes/ruby-ts-mode.el
lisp/progmodes/typescript-ts-mode.el
lisp/treesit.el