From 6ad4f0698eab248fe02b4e01312643b5ae1dcb3a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 11 May 2021 19:01:56 -0400
Subject: [PATCH] Fix #4995: adapt to more renamed comp-* symbols

Two more variables were renamed upstream.
---
 core/cli/autoloads.el | 1 +
 core/core.el          | 6 ++++--
 early-init.el         | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/cli/autoloads.el b/core/cli/autoloads.el
index 4fab7080f..16ccefe09 100644
--- a/core/cli/autoloads.el
+++ b/core/cli/autoloads.el
@@ -15,6 +15,7 @@ one wants that.")
   '(doom-modules
     doom-disabled-packages
     comp-deferred-compilation-deny-list
+    native-comp-deferred-compilation-deny-list
     load-path
     auto-mode-alist
     interpreter-mode-alist
diff --git a/core/core.el b/core/core.el
index b4f032609..8503c0f94 100644
--- a/core/core.el
+++ b/core/core.el
@@ -153,8 +153,10 @@ users).")
 ;;
 ;;; Native Compilation support (http://akrl.sdf.org/gccemacs.html)
 
-;; REVIEW Remove me after a couple weeks.
-(when (boundp 'comp-eln-load-path)
+;; REVIEW Remove after a couple months
+(when (boundp 'comp-deferred-compilation)
+  (defvaralias 'native-comp-deferred-compilation 'comp-deferred-compilation)
+  (defvaralias 'native-comp-deferred-compilation-deny-list 'comp-deferred-compilation-deny-list)
   (defvaralias 'native-comp-eln-load-path 'comp-eln-load-path)
   (defvaralias 'native-comp-warning-on-missing-source 'comp-warning-on-missing-source)
   (defvaralias 'native-comp-driver-options 'comp-native-driver-options)
diff --git a/early-init.el b/early-init.el
index f6701f63c..2e5daf62d 100644
--- a/early-init.el
+++ b/early-init.el
@@ -11,7 +11,10 @@
 ;; Prevent unwanted runtime compilation for gccemacs (native-comp) users;
 ;; packages are compiled ahead-of-time when they are installed and site files
 ;; are compiled when gccemacs is installed.
-(setq comp-deferred-compilation nil)
+;; REVIEW Remove after a couple months
+(if (boundp 'comp-deferred-compilation)
+    (setq comp-deferred-compilation nil)
+  (setq native-comp-deferred-compilation nil))
 
 ;; In noninteractive sessions, prioritize non-byte-compiled source files to
 ;; prevent the use of stale byte-code. Otherwise, it saves us a little IO time