Merge branch 'master' into scratch/comp-static-data

diff --cc lisp/Makefile.in
index b459de49a96576d42665eaeb431a219114cadd1a,fbe502cec6d438cd96cb3671345d5422b7e68e93..3477ef8c856a2a0d8c4ec36656d4d0b4f4fbad81
--- 1/lisp/Makefile.in
--- 2/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@@ -71,17 -71,13 +71,18 @@@ loaddefs = $(shell find ${srcdir} -nam
  AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
    ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
  
 +# Additional flags to pass while compiling *.eln files
 +ELN_COMPILE_FLAGS =
 +
  # Set load-prefer-newer for the benefit of the non-bootstrappers.
+ # Set org--inhibit-version-check to avoid unnecessarily aborting the build.
  BYTE_COMPILE_FLAGS = \
    --eval "(setq load-prefer-newer t byte-compile-warnings 'all)" \
-       $(BYTE_COMPILE_EXTRA_FLAGS)
+   --eval "(setq org--inhibit-version-check t)" $(BYTE_COMPILE_EXTRA_FLAGS)
  # ... but we must prefer .elc files for those in the early bootstrap.
  compile-first: BYTE_COMPILE_FLAGS = $(BYTE_COMPILE_EXTRA_FLAGS)
 +compile-first: ELN_COMPILE_FLAGS = \
 +  --eval "(setq native-comp-compile-static-data nil)"
  
  # Files to compile before others during a bootstrap.  This is done to
  # speed up the bootstrap process.  They're ordered by size, so we use

diff --cc lisp/emacs-lisp/comp.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/casefiddle.c
Simple merge

diff --cc src/ccl.c
Simple merge

diff --cc src/comp.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc test/src/comp-resources/comp-test-funcs.el
Simple merge

diff --cc test/src/comp-tests.el
Simple merge