]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Fri, 23 Dec 2022 05:30:12 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Fri, 23 Dec 2022 05:30:12 +0000 (06:30 +0100)
0754173c923 ; Fix docstring
014232d3840 Eglot: eglot--servers-by-xrefed-file doesn't need to be v...
bbe35c280c2 Prevent stale servers when using eglot-extend-to-xref
9bf13a3fb9e ; * src/alloc.c (Fmemory_info): Doc fix.
baa33a5c054 * etc/tutorials/TUTORIAL.cn: Fix typos.  (Bug#60221)
98d7f76b451 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
a488a6870ac Add alias for removed font-lock function
02e046566e2 Set beginning/end-of-defun-function in treesit-major-mode...
7dea58b88db Add treesit-defun-at-point and fix c-ts-mode-indent-defun
69123d4aa4e ; Fix treesit--defuns-around
05d8310fb5d Use the new keyword ':repeat' in repeatable keymaps.

1  2 
lisp/bindings.el
lisp/comint.el
lisp/progmodes/c-ts-mode.el
lisp/tab-bar.el
lisp/treesit.el
src/alloc.c

Simple merge
diff --cc lisp/comint.el
Simple merge
Simple merge
diff --cc lisp/tab-bar.el
Simple merge
diff --cc lisp/treesit.el
Simple merge
diff --cc src/alloc.c
Simple merge