]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Fri, 20 Jan 2023 10:30:22 +0000 (11:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Fri, 20 Jan 2023 10:30:22 +0000 (11:30 +0100)
commit0f9cf31ccddc6059f4c58c117ec99af02ed44447
tree0dd4d13c1413930934e7c40216fb0813b8c154ea
parentede5e82418a0b8cfce2bf96b2a3255ca86b65000
parent78b83a744fa28abb3bb631e2688c19bd68896425
Merge from origin/emacs-29

78b83a744fa ; * etc/NEWS: Rearrange instructions for building tree-si...
fb82d4e3286 (treesit-simple-indent-presets): Have n-p-gp check for gr...
25ddb3f7d99 ; ruby-ts--indent-rules: Minor cleanup
a0ce569d3b7 ruby-toggle-block: Fix in ruby-ts-mode
0d3b6518e39 (ruby-ts--indent-rules): Indent inside empty parens properly
7fb69ce233b ; * doc/emacs/modes.texi (Choosing Modes): Add index entr...

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/progmodes/ruby-ts-mode.el
lisp/treesit.el