From 147b4646d217bd284f6c02949bf7e067f38cb53e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Mar 2017 09:30:38 +0100 Subject: [PATCH] Revert "ox-publish: Raise an error when encountering undefined component" This reverts commit 6e1d174d0a5564f3c18570025a439cbd201290cb. --- lisp/ox-publish.el | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index adcfd2138..44f8097f4 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -413,17 +413,16 @@ project base directory." (defun org-publish-expand-projects (projects-alist) "Expand projects in PROJECTS-ALIST. -This splices all the components into a list." - (delete-dups - (cl-mapcan (lambda (project) - (pcase-let ((`(,name . ,properties) project)) - (cl-mapcan (lambda (component) - (or - (assoc component org-publish-project-alist) - (user-error "Unknown component %S in project %S" - component name))) - (plist-get properties :components)))) - projects-alist))) +This splices all the components into the list." + (let ((rest projects-alist) rtn p components) + (while (setq p (pop rest)) + (if (setq components (plist-get (cdr p) :components)) + (setq rest (append + (mapcar (lambda (x) (assoc x org-publish-project-alist)) + components) + rest)) + (push p rtn))) + (nreverse (delete-dups (delq nil rtn))))) (defun org-publish-get-base-files (project) "Return a list of all files in PROJECT." -- 2.11.4.GIT