From d8e7a2003b2f15b1d4d523af8dc72edfbf572d23 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 2 Jul 2019 23:13:01 +0200 Subject: [PATCH] Fix custom.el writing to DOOMDIR/init.el too early This would cause ~/.doom.d/init.el to exist before `doom quickstart` can copy ~/.emacs.d/init.example.el into it, causing some newcomers to experience a wrong-type-argument: hash-table-p error at startup (and no modules being enabled). --- core/autoload/packages.el | 5 ----- core/core-packages.el | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 8892db757..91fde61ea 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -621,8 +621,3 @@ calls." ;;;###autoload (advice-add #'package-install-selected-packages :override #'doom//install) - -;; Don't save `package-selected-packages' to `custom-file' -;;;###autoload -(advice-add #'package--save-selected-packages :override - (lambda (&optional value) (if value (setq package-selected-packages value)))) diff --git a/core/core-packages.el b/core/core-packages.el index 5b2263be6..2926a1a13 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -62,6 +62,10 @@ missing) and shouldn't be deleted.") ("melpa-mirror" . -2) ("gnu" . -3))) +;; Don't save `package-selected-packages' to `custom-file' +(advice-add #'package--save-selected-packages :override + (lambda (&optional value) (if value (setq package-selected-packages value)))) + (when (or (not gnutls-verify-error) (not (ignore-errors (gnutls-available-p)))) (dolist (archive package-archives)