Skip to content

Defer elpaca form as a lambda #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Defer elpaca form as a lambda #413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions elpaca.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,9 +729,9 @@ Optional ARGS are passed to `elpaca--signal', which see."
(when-let* ((forms (nreverse (elpaca-q<-forms q))))
(with-current-buffer (get-buffer-create " *elpaca--finalize-queue*")
(setq-local lexical-binding t)
(cl-loop for (id . body) in forms
(cl-loop for (id . cb) in forms
do (condition-case-unless-debug err
(eval `(progn ,@body) t)
(funcall cb)
((error) (warn "Config Error %s: %S" id err)))))
(setf (elpaca-q<-forms q) nil))
(run-hooks 'elpaca-post-queue-hook)
Expand Down Expand Up @@ -1614,14 +1614,14 @@ When quit with \\[keyboard-quit], running sub-processes are not stopped."
(when (> (elpaca-q<-processed q) 0) (cl-decf (elpaca-q<-processed q)))
(setf (elpaca-q<-status q) 'incomplete)))

(defun elpaca--expand-declaration (order body)
"Expand ORDER declaration, deferring BODY."
(defun elpaca--expand-declaration (order callback)
"Expand ORDER declaration, deferring CALLBACK."
(unless order (signal 'wrong-type-argument '((or symbolp consp) nil)))
(when (memq (car-safe order) '(quote \`)) (setq order (eval order t)))
(let* ((id (elpaca--first order))
(q (or (and after-init-time (elpaca--q (elpaca-get id))) (car elpaca--queues)))
(e (elpaca--queue order q)))
(when body (setf (alist-get id (elpaca-q<-forms q)) body))
(when callback (setf (alist-get id (elpaca-q<-forms q)) callback))
(when after-init-time
(elpaca--maybe-log)
(unless (eq (elpaca--status e) 'failed)
Expand All @@ -1639,7 +1639,8 @@ When quit with \\[keyboard-quit], running sub-processes are not stopped."
Evaluate BODY forms synchronously once ORDER's queue is processed.
See Info node `(elpaca) Basic Concepts'."
(declare (indent 1) (debug form))
`(elpaca--expand-declaration ',order ',body))
(when body (setq body `(lambda () ,@body)))
`(elpaca--expand-declaration ',order ,body))

(defvar elpaca--try-package-history nil "History for `elpaca-try'.")
;;;###autoload
Expand Down