From e175fabcdd37f89db13ab90615cf0baa7bade4d9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 13 Oct 2014 00:25:24 +0200 Subject: [PATCH] Sync Org 8.2.10 --- lisp/org/org-agenda.el | 3 +-- lisp/org/org-version.el | 4 ++-- lisp/org/ox-publish.el | 6 +++--- lisp/org/ox.el | 7 ++++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index e0229367eeb..c11c1c8ba41 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -5089,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable "Get the (Emacs Calendar) diary entries for DATE." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (diary-display-hook '(fancy-diary-display)) - (diary-display-function 'fancy-diary-display) + (diary-display-function 'diary-fancy-display) (pop-up-frames nil) (diary-list-entries-hook (cons 'org-diary-default-entry diary-list-entries-hook)) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 00f6c82272f..aae65cc6d37 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-release "8.2.9")) + (let ((org-release "8.2.10")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-git-version "release_8.2.9")) + (let ((org-git-version "release_8.2.10")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el index 1dc790daf37..efc70d22a83 100644 --- a/lisp/org/ox-publish.el +++ b/lisp/org/ox-publish.el @@ -881,7 +881,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))) @@ -899,7 +899,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 @@ -921,7 +921,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))) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 24d0c874563..1327ae409ed 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -5479,8 +5479,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. @@ -5532,7 +5533,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) -- 2.39.2