]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Thu, 2 Mar 2023 05:30:15 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Thu, 2 Mar 2023 05:30:15 +0000 (06:30 +0100)
07f3236133b * src/profiler.c (malloc_probe): Make it safe for GC (bug...
1f1d36fa808 * lisp/emacs-lisp/debug-early.el (debug-early-backtrace):...
99df815c153 Revert "Don't disable eldoc when doing edebug"
0a4b1c0102d ; Eglot: improve bug-reference-url-format/bug-reference-u...
40c9fc8e3b3 Eglot: work around Tramp instability bug#61350
4a6db125b9e Fix treesit-indent-region
7ef9a8210c9 Replace C++ comments with C style equivalents

1  2 
lisp/progmodes/eglot.el
lisp/treesit.el
src/alloc.c
src/xdisp.c

Simple merge
diff --cc lisp/treesit.el
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/xdisp.c
Simple merge