Skip to content

Commit 5410bb6

Browse files
committed
check quelpa package availability using a simpler form that doesn't require package
1 parent 5cd28b7 commit 5410bb6

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

quelpa-use-package.el

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,15 @@ This option will disable `quelpa-persistent-cache-p'."
9898
(let ((info (pcase (car args)
9999
((pred listp) (car args))
100100
(`,pkg `(,pkg)))))
101-
`((if (and quelpa-use-package-inhibit-loading-quelpa
102-
(package-installed-p ',(car info)))
103-
(when quelpa-use-package-as-source-of-truth
104-
(setq quelpa-cache (when (boundp 'quelpa-cache) quelpa-cache))
105-
(setf (alist-get ',(car info) quelpa-cache) ',(cdr info)))
106-
(quelpa ',@args))))
101+
`((let ((pkg ',(car info)))
102+
(require 'finder-inf nil t)
103+
(if (and quelpa-use-package-inhibit-loading-quelpa
104+
(or (assq pkg package--builtins)
105+
(memq pkg package-activated-list)))
106+
(when quelpa-use-package-as-source-of-truth
107+
(setq quelpa-cache (when (boundp 'quelpa-cache) quelpa-cache))
108+
(setf (alist-get ',(car info) quelpa-cache) ',(cdr info)))
109+
(quelpa ',@args)))))
107110
body)
108111
body)))
109112

0 commit comments

Comments
 (0)