From 641d4a1b71d23998fc9042cb8a93f3aa3e0da73f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 25 Oct 2019 04:00:49 -0400 Subject: [PATCH] Fix ':built-in prefer' in package! It was treating 'prefer as truthy, thus preventing packages with it from being installed (like so-long). --- core/core-packages.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index b8023186e..516ed93b9 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -232,12 +232,13 @@ elsewhere." nil)))) ;; Handle :built-in - (unless ,ignore - (when-let (built-in ,built-in) - (doom-log "Ignoring built-in package %S" name) - (when (eq built-in 'prefer) - (setq built-in '(locate-library ,(symbol-name name) nil doom--initial-load-path)))) - (plist-put! plist :ignore ,built-in)) + (let ((built-in ,built-in)) + (unless ,ignore + (when built-in + (doom-log "Ignoring built-in package %S" name) + (when (eq built-in 'prefer) + (setq built-in (locate-library (symbol-name name) nil doom--initial-load-path)))) + (plist-put! plist :ignore built-in))) ;; DEPRECATED Translate :fetcher to :host (with-plist! plist (recipe)