From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 13 Apr 2021 10:06:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'savannah/master' into native-comp
X-Git-Tag: emacs-28.0.90~2727^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b064ddd3f600ed28e62b09d556ecced5f80d9883;p=emacs.git

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

b064ddd3f600ed28e62b09d556ecced5f80d9883
diff --cc configure.ac
index 3892eaed64b,d3647bdc2a2..a47871fbd89
--- a/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 lisp/loadup.el
index 650288f9f86,d6cfcd6fc81..c82d08133cf
--- a/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)
  
  
  ;; Local Variables: