[Emacs-diffs] emacs-24 r117576: Sync Org 8.2.10

[Bastien Guerry]

------------------------------------------------------------
revno: 117576
revision-id: address@hidden
parent: address@hidden
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-13 00:25:24 +0200
message:
  Sync Org 8.2.10
modified:
  lisp/org/org-agenda.el         
orgagenda.el-20091113204419-o5vbwnq5f7feedwu-8640
  lisp/org/org-version.el        orgversion.el-20120930151248-fsivhdtofzv2elux-1
  lisp/org/ox-publish.el         oxpublish.el-20131112130502-8825zrk0dp6b9sq5-16
  lisp/org/ox.el                 ox.el-20131112130502-8825zrk0dp6b9sq5-18

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2014-10-12 05:18:57 +0000
+++ b/lisp/org/org-agenda.el    2014-10-12 22:25:24 +0000
@@ -5089,8 +5089,7 @@
   "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))

=== modified file 'lisp/org/org-version.el'
--- a/lisp/org/org-version.el   2014-10-12 05:18:57 +0000
+++ b/lisp/org/org-version.el   2014-10-12 22:25:24 +0000
@@ -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)

=== modified file 'lisp/org/ox-publish.el'
--- a/lisp/org/ox-publish.el    2014-10-03 08:13:51 +0000
+++ b/lisp/org/ox-publish.el    2014-10-12 22:25:24 +0000
@@ -881,7 +881,7 @@
                          ;; 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 @@
 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 @@
   (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)))

=== modified file 'lisp/org/ox.el'
--- a/lisp/org/ox.el    2014-10-12 05:18:57 +0000
+++ b/lisp/org/ox.el    2014-10-12 22:25:24 +0000
@@ -5479,8 +5479,9 @@
 (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 @@
            ;; 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)