]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Sat, 31 Dec 2022 05:30:21 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Sat, 31 Dec 2022 05:30:21 +0000 (06:30 +0100)
commit2ec4e187c9c4592f9fbd86b67854110252b80140
tree6b929b845c32a09cd2d64547c13d6e20dff575db
parent57e363a4514bddc443414aec1528fd9501d85034
parentab1f245f1a1b36bae9a3051b6cb93ecd5b78dd7a
Merge from origin/emacs-29

ab1f245f1a1 Show tree-sitter query source when signaling query error
0b58ea0e602 ; * lisp/treesit.el (treesit--install-language-grammar-1)...
724da28763c Add version tags and mention the new options in NEWS
8675f4136c7 Add new options for Ruby code indentation
4922de626f0 ; Fix doc strings of 'treesit-install-language-grammar'
69b2aaaaded ; Fix recently modified docs of 'set-face-attribute' (bug...
0248fc9e1ac Add treesit-install-language-grammar
0237c5927e9 Add treesit-language-abi-version
312f82d36f0 Change "language definition" to "language grammar" in man...
fba35657da5 ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--fill-paragrap...
dec1b37a32b ; * doc/lispref/parsing.texi (Accessing Node Information)...
39265abf0cc * test/lisp/net/tramp-tests.el (tramp-test32-shell-comman...
ebf65c7e7e3 * lisp/eshell/em-tramp.el (tramp): Require also at runtim...

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/progmodes/c-ts-mode.el
lisp/treesit.el
test/lisp/net/tramp-tests.el