summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-10-13 16:41:12 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-10-13 16:41:12 (GMT)
commitb5356dadb4cf886e10203df7c977126d7cd4b7d8 (patch)
tree88c8f8be81c6d9708488c939a4ea05f838c14c0c
parentf37f3596a26758760518942098ea4b93b43ecaf2 (diff)
parent9c1ef6df931e50c80866eae1a8d786aca2611612 (diff)
downloadorg-mode-b5356dadb4cf886e10203df7c977126d7cd4b7d8.zip
org-mode-b5356dadb4cf886e10203df7c977126d7cd4b7d8.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-publish.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index f89aa27..cfa7967 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -893,10 +893,11 @@ in another process."
(interactive "P")
(if async
(org-export-async-start 'ignore
- `(when ',force (org-publish-remove-all-timestamps))
- `(let ((org-publish-use-timestamps-flag
- (if ',force nil ,org-publish-use-timestamps-flag)))
- (org-publish-projects ',org-publish-project-alist)))
+ `(progn
+ (when ',force (org-publish-remove-all-timestamps))
+ (let ((org-publish-use-timestamps-flag
+ (if ',force nil ,org-publish-use-timestamps-flag)))
+ (org-publish-projects ',org-publish-project-alist))))
(when force (org-publish-remove-all-timestamps))
(save-window-excursion
(let ((org-publish-use-timestamps-flag