mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-15 17:00:26 +00:00
Code Issues Releases Activity

Sync Org 8.2.10

Browse Source
This commit is contained in:
Bastien Guerry 2014-10-13 00:25:24 +02:00
parent 2222349c25
commit e175fabcdd
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org/org-agenda.el
View File

@ -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." "Get the (Emacs Calendar) diary entries for DATE."
(require 'diary-lib) (require 'diary-lib)
(let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
(diary-display-hook '(fancy-diary-display)) (diary-display-function 'diary-fancy-display)
(diary-display-function 'fancy-diary-display)
(pop-up-frames nil) (pop-up-frames nil)
(diary-list-entries-hook (diary-list-entries-hook
(cons 'org-diary-default-entry diary-list-entries-hook)) (cons 'org-diary-default-entry diary-list-entries-hook))

4
lisp/org/org-version.el
View File

@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of org-mode. "The release version of org-mode.
Inserted by installing org-mode or when a release is made." 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)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of org-mode. "The Git version of org-mode.
Inserted by installing org-mode or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)

6
lisp/org/ox-publish.el
View File

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

7
lisp/org/ox.el
View File

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