]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into HEAD
authorAndrea Corallo <akrl@sdf.org>
Sun, 27 Dec 2020 16:54:57 +0000 (17:54 +0100)
committerAndrea Corallo <akrl@sdf.org>
Sun, 27 Dec 2020 16:54:57 +0000 (17:54 +0100)
1  2 
configure.ac
etc/NEWS
lib/Makefile.in
lisp/emacs-lisp/find-func.el
lisp/emacs-lisp/package.el
lisp/subr.el
nt/mingw-cfg.site
src/Makefile.in
src/alloc.c
src/lisp.h
test/Makefile.in

diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge
index a2c939969709434420767bd705e55725d511761c,96300774871875ae1025d7643b4c0888410df0b9..431fdab51bb9524aa1ff4de56c76e3bd0ce9450a
@@@ -156,7 -158,7 +158,11 @@@ gl_cv_func_copy_file_range=ye
  # We don't want to build Emacs so it depends on bcrypt.dll, since then
  # it will refuse to start on systems where that DLL is absent.
  gl_cv_lib_assume_bcrypt=no
 +# Force 'ac_cv_func_strsignal' to no as mingw64 libgccjit exports this
 +# symbol erroneously
 +# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83>.
 +ac_cv_func_strsignal=no
+ # Don't build the Gnulib free.c: it is not needed, since the w32
+ # implementation of 'free' doesn't touch errno, and it emits a
+ # compilation warning.
+ gl_cv_func_free_preserves_errno=yes
diff --cc src/Makefile.in
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/lisp.h
Simple merge
Simple merge