Replace doom-package-*-p with doom-package-prop
This commit is contained in:
parent
732dee608a
commit
cacd188286
1 changed files with 7 additions and 11 deletions
|
@ -76,16 +76,12 @@ list of the package."
|
||||||
(list name old-version new-version)))))
|
(list name old-version new-version)))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun doom-package-ignored-p (name)
|
(defun doom-package-prop (name prop)
|
||||||
"Return t if NAME (a package symbol) has an :ignore property."
|
"Return PROPerty in NAME's plist."
|
||||||
|
(cl-assert (symbolp name) t)
|
||||||
|
(cl-assert (keywordp prop) t)
|
||||||
(doom-initialize-packages)
|
(doom-initialize-packages)
|
||||||
(plist-get (cdr (assq name doom-packages)) :ignore))
|
(plist-get (cdr (assq name doom-packages)) prop))
|
||||||
|
|
||||||
;;;###autoload
|
|
||||||
(defun doom-package-frozen-p (name)
|
|
||||||
"Return t if NAME (a package symbol) has an :frozen property."
|
|
||||||
(doom-initialize-packages)
|
|
||||||
(plist-get (cdr (assq name doom-packages)) :freeze))
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun doom-get-packages ()
|
(defun doom-get-packages ()
|
||||||
|
@ -128,7 +124,7 @@ If INCLUDE-FROZEN-P is non-nil, check frozen packages as well.
|
||||||
|
|
||||||
Used by `doom/packages-update'."
|
Used by `doom/packages-update'."
|
||||||
(cl-loop for pkg in (doom-get-packages)
|
(cl-loop for pkg in (doom-get-packages)
|
||||||
if (or (and (doom-package-frozen-p (car pkg))
|
if (or (and (doom-package-prop (car pkg) :freeze)
|
||||||
include-frozen-p)
|
include-frozen-p)
|
||||||
(doom-package-outdated-p (car pkg)))
|
(doom-package-outdated-p (car pkg)))
|
||||||
collect it))
|
collect it))
|
||||||
|
@ -159,7 +155,7 @@ Used by `doom/packages-install'."
|
||||||
unless
|
unless
|
||||||
(let ((pkg (car pkgsym)))
|
(let ((pkg (car pkgsym)))
|
||||||
(or (assq pkg package-alist)
|
(or (assq pkg package-alist)
|
||||||
(unless include-ignored-p (doom-package-ignored-p pkg))
|
(unless include-ignored-p (doom-package-prop pkg :ignore))
|
||||||
(and (not (plist-get (assq pkg doom-packages) :pin))
|
(and (not (plist-get (assq pkg doom-packages) :pin))
|
||||||
(assq pkg package--builtins))))
|
(assq pkg package--builtins))))
|
||||||
collect pkgsym))
|
collect pkgsym))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue