ox-publish: Allow plain as lambda preparation/completion-function

* lisp/ox-publish.el (org-publish-projects): Check for function before
  check for cons to capture lambda's as such.

Reported by Arne Babenhauserheide
https://lists.gnu.org/archive/html/emacs-orgmode/2020-03/msg00284.html

(cherry picked from commit fffba5b7fd)
This commit is contained in:
Marco Wahl 2020-03-30 11:10:12 +02:00
parent 685b2c4410
commit 50ae73854b
1 changed files with 4 additions and 4 deletions

View File

@ -659,8 +659,8 @@ If `:auto-sitemap' is set, publish the sitemap too. If
(let ((plist (cdr project)))
(let ((fun (org-publish-property :preparation-function project)))
(cond
((consp fun) (dolist (f fun) (funcall f plist)))
((functionp fun) (funcall fun plist))))
((functionp fun) (funcall fun plist))
((consp fun) (dolist (f fun) (funcall f plist)))))
;; Each project uses its own cache file.
(org-publish-initialize-cache (car project))
(when (org-publish-property :auto-sitemap project)
@ -685,8 +685,8 @@ If `:auto-sitemap' is set, publish the sitemap too. If
(org-publish-file theindex project t)))
(let ((fun (org-publish-property :completion-function project)))
(cond
((consp fun) (dolist (f fun) (funcall f plist)))
((functionp fun) (funcall fun plist)))))
((functionp fun) (funcall fun plist))
((consp fun) (dolist (f fun) (funcall f plist))))))
(org-publish-write-cache-file)))