From 54c67eb29e751dfe1516adf332d5a033e8257a02 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 11 May 2021 19:25:34 -0400 Subject: [PATCH] Fix #5038: renamed comp variables in sandbox loader --- core/autoload/sandbox.el | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core/autoload/sandbox.el b/core/autoload/sandbox.el index ea673fc3d..12ced2221 100644 --- a/core/autoload/sandbox.el +++ b/core/autoload/sandbox.el @@ -82,12 +82,16 @@ package-user-dir ,package-user-dir package-archives ',package-archives) ;; comp.el - (setq comp-deferred-compilation nil - native-comp-eln-load-path ',(bound-and-true-p native-comp-eln-load-path) - native-comp-async-env-modifier-form ',(bound-and-true-p comp-async-env-modifier-form) - comp-deferred-compilation-black-list ',(bound-and-true-p comp-deferred-compilation-black-list) - ;; REVIEW Remove me after a couple weeks - comp-eln-load-path ',(bound-and-true-p native-comp-eln-load-path)) + (if (boundp 'comp-deferred-compilation) + ;; REVIEW Remove me after a month + (setq comp-deferred-compilation nil + comp-deferred-compilation-deny-list ',(bound-and-true-p native-comp-async-env-modifier-form) + comp-async-env-modifier-form ',(bound-and-true-p native-comp-async-env-modifier-form) + comp-eln-load-path ',(bound-and-true-p native-comp-eln-load-path)) + (setq native-comp-deferred-compilation nil + native-comp-deferred-compilation-deny-list ',(bound-and-true-p native-comp-async-env-modifier-form) + native-comp-async-env-modifier-form ',(bound-and-true-p native-comp-async-env-modifier-form) + native-comp-eln-load-path ',(bound-and-true-p native-comp-eln-load-path))) ;; (add-hook 'kill-emacs-hook ;; (lambda () ;; (delete-file user-init-file)