]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into native-comp
authorAndrea Corallo <akrl@sdf.org>
Thu, 25 Mar 2021 15:29:07 +0000 (16:29 +0100)
committerAndrea Corallo <akrl@sdf.org>
Thu, 25 Mar 2021 15:29:07 +0000 (16:29 +0100)
1  2 
etc/NEWS
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-macs.el
lisp/subr.el
src/lisp.h
src/window.c

diff --cc etc/NEWS
Simple merge
Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge