From: Andrea Corallo Date: Fri, 11 Feb 2022 14:19:56 +0000 (+0100) Subject: * lisp/startup.el (normal-top-level): Small code move, improve 202d3be873. X-Git-Tag: emacs-28.0.92~55 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=efaa0ebca9ec445329643fea2f9fe883d7ccdc3a;p=emacs.git * lisp/startup.el (normal-top-level): Small code move, improve 202d3be873. --- diff --git a/lisp/startup.el b/lisp/startup.el index d369f3ef84e..9ebd4c1a707 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -540,15 +540,15 @@ It is the default value of the variable `top-level'." (setq user-emacs-directory (startup--xdg-or-homedot startup--xdg-config-home-emacs nil)) - (unless (native-comp-available-p) - ;; Disable deferred async compilation and trampoline synthesis - ;; in this session. This is necessary if libgccjit is not - ;; available on MS-Windows, but Emacs was built with - ;; native-compilation support. - (setq native-comp-deferred-compilation nil - comp-enable-subr-trampolines nil)) - (when (featurep 'native-compile) + (unless (native-comp-available-p) + ;; Disable deferred async compilation and trampoline synthesis + ;; in this session. This is necessary if libgccjit is not + ;; available on MS-Windows, but Emacs was built with + ;; native-compilation support. + (setq native-comp-deferred-compilation nil + comp-enable-subr-trampolines nil)) + ;; Form `native-comp-eln-load-path'. (let ((path-env (getenv "EMACSNATIVELOADPATH"))) (when path-env