From 7fad360c3e8fd157cfad9e6ce9732bb4053773d1 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 9 May 2021 00:57:28 +0100
Subject: [PATCH] fix(native-comp): update config to support recent variable
 name changes

---
 early-init.el                | 32 +++++++++++++++++++++-----------
 straight/versions/default.el | 32 ++++++++++++++++----------------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/early-init.el b/early-init.el
index c01aa7b..4e178d3 100644
--- a/early-init.el
+++ b/early-init.el
@@ -7,15 +7,26 @@
 ;;; Code:
 
 ;; Native-Comp
-(setq comp-speed 2
-      comp-async-query-on-exit t)
+(if (boundp 'native-comp-speed)
+    (setq native-comp-speed 2)
+  (setq comp-speed 2))
 
-(setq comp-deferred-compilation-deny-list
-      '("\\(?:[/\\\\]\\.dir-locals\\.el$\\)"
-        ;; Don't native-compile *-authloads.el and *-pkg.el files as they
-        ;; seem to produce errors during native-compile.
-        "\\(?:[^z-a]*-autoloads\\.el$\\)"
-        "\\(?:[^z-a]*-pkg\\.el$\\)"))
+(if (boundp 'native-comp-async-report-warnings-errors)
+    (setq native-comp-async-report-warnings-errors nil)
+  (setq comp-async-report-warnings-errors 2))
+
+(if (boundp 'native-comp-async-query-on-exit)
+    (setq native-comp-async-query-on-exit t)
+  (setq comp-async-query-on-exit t))
+
+(let ((deny-list '("\\(?:[/\\\\]\\.dir-locals\\.el$\\)"
+                   ;; Don't native-compile *-authloads.el and *-pkg.el files as they
+                   ;; seem to produce errors during native-compile.
+                   "\\(?:[^z-a]*-autoloads\\.el$\\)"
+                   "\\(?:[^z-a]*-pkg\\.el$\\)")))
+  (if (boundp 'native-comp-deferred-compilation-deny-list)
+      (setq native-comp-deferred-compilation-deny-list deny-list)
+    (setq comp-deferred-compilation-deny-list deny-list)))
 
 (when (or (boundp 'comp-eln-load-path) (boundp 'native-comp-eln-load-path))
   (let ((eln-cache-dir (expand-file-name "cache/eln-cache/"
@@ -23,9 +34,8 @@
         (find-exec (executable-find "find")))
 
     (if (boundp 'native-comp-eln-load-path)
-        (setcar native-comp-eln-load-path eln-cache-dir))
-    (if (boundp 'comp-eln-load-path)
-        (setcar comp-eln-load-path eln-cache-dir))
+        (setcar native-comp-eln-load-path eln-cache-dir)
+      (setcar comp-eln-load-path eln-cache-dir))
     ;; Quitting emacs while native compilation in progress can leave zero byte
     ;; sized *.eln files behind. Hence delete such files during startup.
     (when find-exec
diff --git a/straight/versions/default.el b/straight/versions/default.el
index ab4c0bc..153295c 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -9,14 +9,14 @@
  ("bundler.el" . "43efb6be4ed118b06d787ce7fbcffd68a31732a7")
  ("caddyfile-mode" . "976ad0664c3f44bfa11cb9b8787ddfb094d0a666")
  ("cargo.el" . "0174599fd1c1b429042c7ca67c3d45f07441a43d")
- ("centaur-tabs" . "51f28d03936aef5237f14bc08b2ae26949ecef0f")
+ ("centaur-tabs" . "9c7c936e4e1de6f4f4095d70e43c9ae738d05086")
  ("cfrs" . "7c42f2c82c7ae689f3ef291b066688c58ab96298")
  ("closql" . "1d5e9cbb69bc2992eaafa1bc084343efbd3e0c4c")
  ("coffee-mode" . "35a41c7d8233eac0b267d9593e67fb8b6235e134")
- ("company-mode" . "fc476ff738c3e232b0655ca071277a0cbd90d525")
+ ("company-mode" . "2cca48a061049db737ce7793630c799cfd02b077")
  ("company-nginx" . "82bdb730ad5971c594d9c99c069f3c7bb067897d")
  ("cucumber.el" . "8e1464113b489b54067294cd988ff6a11a423fdb")
- ("dap-mode" . "e8fe25768c44ba005e0ff51a0d781ba1693e60a0")
+ ("dap-mode" . "49af1b8cbd261a5f97e1b2886418dae5e51b452d")
  ("dart-mode" . "43975c92080e307c4bc14a4773a61195d2062fd9")
  ("dash-at-point" . "4d795a23a8428c421d5107f1b005c9d8e0d1816c")
  ("dash.el" . "b9286a84975874b10493f1cb4ea051c501f51273")
@@ -36,12 +36,13 @@
  ("el-get" . "d76ac84ae9670de7bf7725b362cafe86688771f9")
  ("elisp-refs" . "b3634a4567c655a1cda51b217629849cba0ac6a7")
  ("emacs-async" . "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19")
- ("emacs-doom-themes" . "cdfbf878bae788b8d4a983c19e3ab3b1d39cfdea")
+ ("emacs-doom-themes" . "4d24728f11853b5bd231687ac3f7a95108688313")
  ("emacs-hcl-mode" . "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd")
  ("emacs-htmlize" . "49205105898ba8993b5253beec55d8bddd820a70")
  ("emacs-kv" . "721148475bce38a70e0b678ba8aa923652e8900e")
  ("emacs-libvterm" . "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983")
  ("emacs-memoize" . "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd")
+ ("emacs-reformatter" . "cb9a5938541a28c50ecb8f72e32b67531b8bf606")
  ("emacs-shfmt" . "49c9e11567874bc4c5c4b3578a6b8f6b1948c691")
  ("emacs-slim" . "3636d18ab1c8b316eea71c4732eb44743e2ded87")
  ("emacs-which-key" . "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199")
@@ -53,16 +54,16 @@
  ("expand-region.el" . "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0")
  ("explain-pause-mode" . "2356c8c3639cbeeb9751744dbe737267849b4b51")
  ("f.el" . "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec")
- ("fbthrift" . "4dfa69deeed5f3bdd14c51c1477650cba7cbfb97")
+ ("fbthrift" . "9dcad573eaf4886fe1106deaa89d0d285b256be5")
  ("flutter.el" . "960b63576a13b7bd3495d0ad1883ed736873543b")
  ("flycheck" . "f8c679fff349850c80541a31de50009c3c15d4c9")
  ("flycheck-package" . "303f9e0708292937a668e1145f5eaa19d7d374e2")
  ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600")
  ("flyspell-correct" . "d19a090b978a249fc8f6d8b14309a5705a6bb483")
- ("forge" . "ab13c85a4401e7eb79133a96f2e12f2e2dfea7cb")
+ ("forge" . "37aa4e4b82a99246b3551daee6104dc1d192174a")
  ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
  ("ghub" . "d6e6b0666104f3896d05d2b03d08d84d9dca096f")
- ("git-link" . "2b510cf3f28bed842853294fc4ee23c7f8b6435a")
+ ("git-link" . "0d2fd02c160cf2a09ca4b5b4ffa544833df5afed")
  ("git-modes" . "7678ead3cdbb1692c9728b9730c016283ed97af1")
  ("git-timemachine" . "8d675750e921a047707fcdc36d84f8439b19a907")
  ("github-browse-file" . "9742a5183af853788c6ecb83fb7ee0b00d1675ac")
@@ -74,11 +75,11 @@
  ("go-playground" . "ede417a52c0eea1a69658f4c6c6c12d6165e64a4")
  ("go-projectile" . "ad4ca3b5695a0e31e95e3cc4ccab498f87d68303")
  ("gotest.el" . "9b1dc4eba1b22d751cb2f0a12e29912e010fac60")
- ("goto-chg" . "2af612153bc9f5bed135d25abe62f46ddaa9027f")
+ ("goto-chg" . "3ce1389fea12edde4e343bc7d54c8da97a1a6136")
  ("grip-mode" . "28552059c4643f571ef0883ad543270a48241572")
  ("groovy-emacs-modes" . "26da902d1158c0312628d57578109be54eca2415")
  ("haml-mode" . "bf5b6c11b1206759d2b28af48765e04882dd1fc4")
- ("haskell-mode" . "886795c15036d566aeced66f9508ae61ec0287ec")
+ ("haskell-mode" . "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f")
  ("helm" . "2bd6408db37eb282bda9f5250b5465ffa42b7ad6")
  ("helm-ag" . "51e164b4bb1a9826fe8b39c0d02b4064c9352b9f")
  ("helm-descbinds" . "b72515982396b6e336ad7beb6767e95a80fca192")
@@ -106,15 +107,15 @@
  ("kubernetes-el" . "de4ff6ccdf58a939908d384efe9cf06b2bcabe12")
  ("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("lsp-mode" . "894cf20547273d153b3bd440444956d8410d84de")
+ ("lsp-mode" . "fd05f0d4d87510bdf25aeeeb7e7d90dace71af4c")
  ("lsp-treemacs" . "b07868740d6f7d364e496048cee00bce10a6ab33")
  ("lsp-ui" . "efae00eb6a733d5271cb33e9d92c3d8c2fa98dde")
  ("lua-mode" . "2d9a468b94acd8480299d47449b53136060b7b23")
  ("magit" . "471c63d92ce22b8ea653f821bc1893ecea324d4d")
  ("magit-popup" . "d8585fa39f88956963d877b921322530257ba9f5")
  ("markdown-mode" . "9977753eebe3f5cca7ab85b18a7c719fdb0b7654")
- ("melpa" . "780449de5166ddfc2a87ecaf4127f18bf4e7f81f")
- ("mermaid-mode" . "b650649a9f28629154a041ef187c21c5128530f2")
+ ("melpa" . "cd5dfee78c2afb49e59e65b62f2cbe584f3b8e7c")
+ ("mermaid-mode" . "562ffe86cad91627e2b94b8684818562c3ad2b5d")
  ("minions" . "4a81446e13f5bfb514e593d0e1c5253a60113301")
  ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b")
  ("move-dup" . "5906503e0b9b832b1d5062c9cd27cf72a2ce4817")
@@ -143,7 +144,6 @@
  ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
  ("rainbow-mode" . "949166cc0146bc9fabf74ce70c1c4a097f4cffd4")
  ("recursive-narrow" . "5e3e2067d5a148d7e64e64e0355d3b6860e4c259")
- ("reformatter.el" . "576d339aa80f40c6053592988001bdb285c1cf21")
  ("resize-window" . "72018aa4d2401b60120588199d4cedd0dc1fbcfb")
  ("restart-emacs" . "1607da2bc657fe05ae01f7fdf26f716eafead02c")
  ("restclient.el" . "a97dcc486a54d947aa15eeaedaccb3481f14fd85")
@@ -168,7 +168,7 @@
  ("spinner" . "e19f3cfc0646c0e23c10c22df219fcf427054621")
  ("sqlformat" . "0351dad6bec06a381484c0c95309d46a7a8acdb4")
  ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016")
- ("straight.el" . "9eb2e058665ad1144c66d2b1b816f9effa37907e")
+ ("straight.el" . "62465159c5008becc3acaa86db661e4a962fc19f")
  ("string-edit.el" . "0e225df6f8740467231c787a50025e4552b3eddb")
  ("string-inflection" . "c4a519be102cb99dd86be3ee8c387f008d097635")
  ("tablist" . "faab7a035ef2258cc4ea2182f67e3aedab7e2af9")
@@ -193,10 +193,10 @@
  ("xterm-color" . "1a4012854c69a5cdaeb5a73d2ad705011892fca3")
  ("xwidget-plus" . "f67e070a6e1b233e60274deb717274b000923231")
  ("yaml-imenu.el" . "fa37d9bf8a09af144980a42cc22891b1555a12ae")
- ("yaml-mode" . "fc5e1c58f94472944c4aa838f00f6adcac6fa992")
+ ("yaml-mode" . "3a57058468211f3cb18e71aecc630dcacb87636b")
  ("yari.el" . "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9")
  ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
  ("yasnippet-snippets" . "be823d7e1a1a46454d60a9f3dabb16b68b5dd853")
- ("zone-nyan" . "253a0484ea5076c0f485c561a3f8370ba560f4f2")
+ ("zone-nyan" . "38b6e9f1f5871e9166b00a1db44680caa56773be")
  ("zoom-window" . "474ca4723517d95356145950b134652d5dc0c7f7"))
 :beta