]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Sat, 7 Jan 2023 05:30:10 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Sat, 7 Jan 2023 05:30:10 +0000 (06:30 +0100)
commitabeb29bfcc68c578f11d59dcc1522738d493770a
treeaf85826729e3e6f719c36fed5a51347896bf3d1e
parent39b77970c6155d7d2f1ffd1f9d609ec94ade3165
parent9d410f8de64e91d16999a9bb5dd884d6d06d22bd
Merge from origin/emacs-29

9d410f8de64 (treesit-simple-indent-presets): Ensure 'and' works for a...
ff66a5d324b (treesit--indent-rules-optimize): Optimize 'and' and 'or'...
f2ebe43362c (treesit-simple-indent-presets): Short-circuit 'and' and ...
2ea6ee5cbfa (font-lock-regexp-face): New face
5ab03bcc433 Unify the string interpolation delimiters face across ts ...
92e8c0c091c ruby-ts-mode: Highlight more kinds of parameters
7420b6dcc37 Fix `pr-interface'
699711786ac Further generic-related improvements in csharp-ts-mode (b...

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/progmodes/csharp-mode.el
lisp/progmodes/js.el
lisp/progmodes/typescript-ts-mode.el
lisp/treesit.el