]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into native-comp
authorAndrea Corallo <akrl@sdf.org>
Mon, 19 Apr 2021 16:46:50 +0000 (18:46 +0200)
committerAndrea Corallo <akrl@sdf.org>
Mon, 19 Apr 2021 16:46:50 +0000 (18:46 +0200)
1  2 
etc/NEWS
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-macs.el
lisp/files.el
lisp/progmodes/cc-bytecomp.el
lisp/progmodes/cc-langs.el
src/alloc.c
src/eval.c
src/image.c
src/window.c

diff --cc etc/NEWS
Simple merge
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/eval.c
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/window.c
Simple merge