]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Mon, 13 Feb 2023 05:30:12 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Mon, 13 Feb 2023 05:30:12 +0000 (06:30 +0100)
f2114e8d89f Fix indentation for closing bracket in c-ts-mode (bug#61398)
f49caaa8925 ; * src/pdumper.c (dump_buffer): Update hash.
fe2ea5ddd8d Update to Org 9.6.1-31-gaf1bb1

1  2 
lisp/progmodes/c-ts-mode.el
src/pdumper.c

Simple merge
diff --cc src/pdumper.c
Simple merge