procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
# Conflicts:
#	lisp/startup.el
This commit is contained in:
Eli Zaretskii 2022-02-10 19:12:19 +02:00
commit 2d897f7c66
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/startup.el
View file

@ -541,6 +541,8 @@ DIRS are relative."
(setq comp--compilable t))
(defvar native-comp-eln-load-path)
(defvar native-comp-deferred-compilation)
(defvar comp-enable-subr-trampolines)
(defvar startup--original-eln-load-path nil
"Original value of `native-comp-eln-load-path'.")
@ -601,6 +603,14 @@ 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)
;; Form the initial value of `native-comp-eln-load-path'.
(let ((path-env (getenv "EMACSNATIVELOADPATH")))