mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Nicolas Goaziou 2014-10-12 22:55:38 +02:00
commit 89f5ad36d7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ox-publish.el
View File

@ -886,7 +886,7 @@ publishing will be done asynchronously, in another process."
;; project is still a string here.
(list (assoc project org-publish-project-alist)))))
(if async
(org-export-async-start 'ignore
(org-export-async-start (lambda (results) nil)
`(let ((org-publish-use-timestamps-flag
(if ',force nil ,org-publish-use-timestamps-flag)))
(org-publish-projects ',project-alist)))
@ -904,7 +904,7 @@ optional argument ASYNC, publishing will be done asynchronously,
in another process."
(interactive "P")
(if async
(org-export-async-start 'ignore
(org-export-async-start (lambda (results) nil)
`(progn
(when ',force (org-publish-remove-all-timestamps))
(let ((org-publish-use-timestamps-flag
@ -926,7 +926,7 @@ asynchronously, in another process."
(interactive "P")
(let ((file (buffer-file-name (buffer-base-buffer))))
(if async
(org-export-async-start 'ignore
(org-export-async-start (lambda (results) nil)
`(let ((org-publish-use-timestamps-flag
(if ',force nil ,org-publish-use-timestamps-flag)))
(org-publish-file ,file)))

7
lisp/ox.el
View File

@ -5786,8 +5786,9 @@ to `:default' encoding. If it fails, return S."
(defmacro org-export-async-start (fun &rest body)
"Call function FUN on the results returned by BODY evaluation.
BODY evaluation happens in an asynchronous process, from a buffer
which is an exact copy of the current one.
FUN is an anonymous function of one argument. BODY evaluation
happens in an asynchronous process, from a buffer which is an
exact copy of the current one.
Use `org-export-add-to-stack' in FUN in order to register results
in the stack.
@ -5844,7 +5845,7 @@ and `org-export-to-file' for more specialized functions."
;; Register running process in stack.
(org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process)
;; Set-up sentinel in order to catch results.
(let ((handler ',fun))
(let ((handler ,fun))
(set-process-sentinel
,process
`(lambda (p status)