]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Thu, 5 Jan 2023 05:30:20 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Thu, 5 Jan 2023 05:30:20 +0000 (06:30 +0100)
commite1b2446b2e944acbad6e27f28ee639caa24af198
treece4b6927eb14dcd48fac694a105344d315e4de68
parent1ddd31bf9843c0453af92a09f98935cfcbb4e250
parent92f753dc19010cf4075db5e6bcedcc5ac0fc2e41
Merge from origin/emacs-29

92f753dc190 ; * etc/NEWS: Fix wording in last change.
cef875f6c51 ; * etc/NEWS: Instructions for builds without tree-sitter...
8d530ca6542 ; Fix documentation of y-or-n-p/yes-or-no-p
c18878ee0a2 Fix bug in Tramp multi-hop
7eed8e050a9 * lisp/files.el (find-sibling-rules): Fix docstring.
6b5831c6964 Tree-sitter doc fixes (bug#60524)
651927ac391 ; Fix function reference in comment in c-ts-mode.el (bug#...
c786afcbb9f Fontify C++ function definitions in c-ts-mode (bug#60529)

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/files.el
lisp/net/tramp.el
lisp/progmodes/c-ts-mode.el
lisp/subr.el
lisp/treesit.el
src/fns.c