Merge remote-tracking branch 'savannah/master' into native-comp

diff --cc .gitignore
Simple merge

diff --cc configure.ac
index 3892eaed64b72818458aa2e8320d932e653a5469,d3647bdc2a2c1d6260f1d4a3ff7792933aca3686..a47871fbd89d867fe7b4b708d618371d651745d2
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5796,9 -5694,10 +5818,10 @@@ optsep
  emacs_config_features=
  for opt in ACL CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
   HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
-  M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PNG RSVG SOUND \
-  THREADS TIFF TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS \
-  X_TOOLKIT ZLIB; do
 - M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PNG RSVG SECCOMP SOUND \
 - THREADS TIFF \
++ M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PNG RSVG SECCOMP \
++ SOUND THREADS TIFF \
+  TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS X_TOOLKIT \
+  ZLIB; do
  
      case $opt in
        PDUMPER) val=${with_pdumper} ;;

diff --cc etc/NEWS
Simple merge

diff --cc lisp/cus-dep.el
Simple merge

diff --cc lisp/emacs-lisp/byte-opt.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/loadup.el
index 650288f9f86b1b96f958e7ac46136679575fdafd,d6cfcd6fc8119f7953caaf428de5ba5c3638c5d4..c82d08133cff995f31f05d0bdd88434685e8fe5b
--- 1/lisp/loadup.el
--- 2/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -582,9 -539,8 +582,9 @@@ lost after dumping"))
  ;; Don't keep `load-file-name' set during the top-level session!
  ;; Otherwise, it breaks a lot of code which does things like
  ;; (or load-file-name byte-compile-current-file).
 +(setq load-true-file-name nil)
  (setq load-file-name nil)
- (eval top-level)
+ (eval top-level t)
  
  \f
  ;; Local Variables:

diff --cc lisp/progmodes/cc-bytecomp.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc test/Makefile.in
Simple merge