From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Julien Cubizolles <j.cubizolles@free.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: :completion function isn't run anymore?
Date: Sun, 29 Nov 2015 14:20:21 +0100 [thread overview]
Message-ID: <87mvtxlz6y.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <87y4djbg8c.fsf@free.fr> (Julien Cubizolles's message of "Fri, 27 Nov 2015 16:49:25 +0100")
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
Hello,
Julien Cubizolles <j.cubizolles@free.fr> writes:
> Julien Cubizolles <j.cubizolles@free.fr> writes:
>
>> I noticed that the :preparation-function defined in
>> org-publish-project-alist isn't run anymore when publishing a project.
>
> It seems the preparation-function isn't run either. Consider the
> following more simple examples
>
>
> #+TITLE: Hello
> #+begin_src emacs-lisp :tangle none :exports none
> (setq org-export-in-background nil)
> (defun jc-preparation ()
> "Preparation functions to be run before actually pubishing"
> (setq org-latex-title-command "")
> )
> (setq org-publish-project-alist
> `(("pdf"
> :base-directory "./"
> :publishing-directory "./"
> :preparation-function jc-preparation
> :publishing-function org-beamer-publish-to-pdf
> :exclude ".*"
> :include ,(list (file-name-nondirectory buffer-file-name))
> )
> ))
> #+end_src
>
> #+RESULTS:
> | pdf | :base-directory | ./ | :publishing-directory | ./ | :preparation-function | jc-preparation | :publishing-function | org-beamer-publish-to-pdf | :exclude | .* | :include | (test.org) |
>
> * 1st section
> ** 1st subsection
> ** 2nd subsection
>
> Save the to test.org and publish using the "pdf"
> project. org-beamer-publish-to-pdf creates test.pdf as it should but the
> preparation-function should remove the titlepage wich it doesn't.
I didn't investigate much the issue yet, but, out of curiosity, would
the following patch solve the issue:
Regards,
--
Nicolas Goaziou
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ox-publish.el-Fix-preparation-function-and-completio.patch --]
[-- Type: text/x-diff, Size: 1862 bytes --]
From 28dc2a08846992f0565897ae8e061da685cd776d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 29 Nov 2015 14:16:37 +0100
Subject: [PATCH] ox-publish.el: Fix :preparation-function and
:completion-function
* lisp/ox-publish.el (org-publish-projects): Do not use `run-hooks' in
a lexical binding environment.
Reported-by: Julien Cubizolles <j.cubizolles@free.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/103124>
---
lisp/ox-publish.el | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 90f307c..6c65e52 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -667,9 +667,7 @@ If `:auto-sitemap' is set, publish the sitemap too. If
`:makeindex' is set, also produce a file \"theindex.org\"."
(dolist (project (org-publish-expand-projects projects))
(let ((project-plist (cdr project)))
- (let ((preparation-function
- (plist-get project-plist :preparation-function)))
- (when preparation-function (run-hooks 'preparation-function)))
+ (mapc #'funcall (plist-get project-plist :preparation-function))
;; Each project uses its own cache file.
(org-publish-initialize-cache (car project))
(when (plist-get project-plist :auto-sitemap)
@@ -701,9 +699,7 @@ If `:auto-sitemap' is set, publish the sitemap too. If
(org-publish-index-generate-theindex
project (plist-get project-plist :base-directory))
(org-publish-file theindex project t)))
- (let ((completion-function
- (plist-get project-plist :completion-function)))
- (when completion-function (run-hooks 'completion-function)))
+ (mapc #'funcall (plist-get project-plist :completion-function))
(org-publish-write-cache-file))))
(defun org-publish-org-sitemap (project &optional sitemap-filename)
--
2.6.2
next prev parent reply other threads:[~2015-11-29 13:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-26 23:01 :completion function isn't run anymore? Julien Cubizolles
2015-11-27 15:49 ` Julien Cubizolles
2015-11-29 13:20 ` Nicolas Goaziou [this message]
2015-11-29 20:38 ` Julien Cubizolles
2015-11-29 20:53 ` Nicolas Goaziou
2015-11-29 21:19 ` Julien Cubizolles
2015-11-29 21:39 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mvtxlz6y.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=emacs-orgmode@gnu.org \
--cc=j.cubizolles@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).