Bastien <b...@gnu.org> writes:
> Hi Matt,
>
> Matt Lundin <m...@imapmail.org> writes:
>
>> So to be safe, we could do the following in org-publish-find-date and
>> org-publish-find-title...
>>
>> (org-export-with-buffer-copy (org-export-get-environment))
>>
>> What do you think?
>
> Yes, this sounds right, please go ahead.
>
> I applied your fix in the maint branch, so if you need to revert it
> please do the revert from there first.
Here's the patch. There's no need to revert anything, as this builds
upon my previous commit.
>From 72217e53103a82e0397d1435331e3eed10f0fbd5 Mon Sep 17 00:00:00 2001
From: Matt Lundin <m...@imapmail.org>
Date: Tue, 29 Jul 2014 10:39:57 -0500
Subject: [PATCH 1/2] Call org-export-get-environment in buffer copy
* lisp/ox-publish.el: (org-publish-find-title) (org-publish-find-date)
Make sure to call org-export-get-environment in copy of
buffer. Otherwise, #+bind variables meant for export can be set in
live buffers.
---
lisp/ox-publish.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 94f12e9..26d4be7 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -810,7 +810,10 @@ Default for SITEMAP-FILENAME is 'sitemap.org'."
(buffer (or visiting (find-file-noselect file))))
(with-current-buffer buffer
(let ((title
- (let ((property (plist-get (org-export-get-environment) :title)))
+ (let ((property
+ (plist-get
+ (org-export-with-buffer-copy (org-export-get-environment))
+ :title)))
(if property
(org-no-properties (org-element-interpret-data property))
(file-name-nondirectory (file-name-sans-extension file))))))
@@ -829,7 +832,7 @@ time in `current-time' format."
(file-buf (or visiting (find-file-noselect file nil)))
(date (plist-get
(with-current-buffer file-buf
- (org-export-get-environment))
+ (org-export-with-buffer-copy (org-export-get-environment)))
:date)))
(unless visiting (kill-buffer file-buf))
;; DATE is either a timestamp object or a secondary string. If it
--
2.0.3
