From 0ff68e5a7fab6571c63f72293a954bb062ab0acb Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 27 Dec 2019 01:42:38 -0500 Subject: [PATCH] Don't handle straight transactions anymore Since raxod502/straight.el@e45f726, straight handles its transactions in non-interactive sessions. --- core/core-packages.el | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 5bed3ba81..3bc7ce7a5 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -118,15 +118,11 @@ missing) and shouldn't be deleted.") ;; certain things to work (like magit and org), but we can deal with that ;; when we cross that bridge. straight-vc-git-default-clone-depth 1 - ;; Straight's own emacsmirror mirror is a little smaller and faster. - straight-recipes-emacsmirror-use-mirror t ;; Prefix declarations are unneeded bulk added to our autoloads file. Best ;; we just don't have to deal with them at all. - autoload-compute-prefixes nil) - -(defun doom--finalize-straight () - (mapc #'funcall (delq nil (mapcar #'cdr straight--transaction-alist))) - (setq straight--transaction-alist nil)) + autoload-compute-prefixes nil + ;; We handle it ourselves + straight-fix-org nil) ;;; Getting straight to behave in batch mode (when noninteractive @@ -247,9 +243,7 @@ necessary package metadata is initialized and available for them." (print! (warn "%s\n%s") (format "You've disabled %S" name) (indent 2 (concat "This is a core package. Disabling it will cause errors, as Doom assumes\n" - "core packages are always available. Disable their minor-modes or hooks instead."))))))))) - (unless doom-interactive-mode - (add-hook 'kill-emacs-hook #'doom--finalize-straight)))) + "core packages are always available. Disable their minor-modes or hooks instead."))))))))))) (defun doom-ensure-straight () "Ensure `straight' is installed and was compiled with this version of Emacs."