]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into native-comp
authorAndrea Corallo <akrl@sdf.org>
Wed, 31 Mar 2021 08:48:02 +0000 (10:48 +0200)
committerAndrea Corallo <akrl@sdf.org>
Wed, 31 Mar 2021 08:48:02 +0000 (10:48 +0200)
1  2 
etc/NEWS
lisp/progmodes/elisp-mode.el
lisp/term/w32-win.el
src/data.c
src/pdumper.c

diff --cc etc/NEWS
Simple merge
Simple merge
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/pdumper.c
Simple merge