From 3c96d060b7d92de2222dde35f76a158e71ddf871 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 8 Feb 2017 17:57:27 -0500 Subject: [PATCH] Refactor doom-get-packages & doom/packages-install --- core/autoload/packages.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 43c781df9..1f4ea191d 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -87,9 +87,7 @@ fed to `doom/packages-delete'." (defun doom-get-packages-to-install () "Return a list of packages that aren't installed, but need to be. Used by `doom/packages-install'." - (doom-read-packages t) - (--remove (assq (car it) package-alist) - (append doom-packages (-map 'list doom-protected-packages)))) + (--remove (assq (car it) package-alist) (doom-get-packages))) (defun doom--scrape-sexps (sym file) (declare (indent defun)) @@ -245,8 +243,9 @@ appropriate." (mapconcat (lambda (pkg) (format "+ %s (%s)" (car pkg) - (cond ((plist-get (cdr pkg) :recipe) "QUELPA") - (t "ELPA")))) + (if (plist-get (cdr pkg) :recipe) + "QUELPA" + "ELPA"))) (--sort (string-lessp (symbol-name (car it)) (symbol-name (car other))) packages)