Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
e175fabc
Commit
e175fabc
authored
Oct 13, 2014
by
Bastien Guerry
Browse files
Sync Org 8.2.10
parent
2222349c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
lisp/org/org-agenda.el
lisp/org/org-agenda.el
+1
-2
lisp/org/org-version.el
lisp/org/org-version.el
+2
-2
lisp/org/ox-publish.el
lisp/org/ox-publish.el
+3
-3
lisp/org/ox.el
lisp/org/ox.el
+4
-3
No files found.
lisp/org/org-agenda.el
View file @
e175fabc
...
...
@@ -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))
...
...
lisp/org/org-version.el
View file @
e175fabc
...
...
@@ -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
)
...
...
lisp/org/ox-publish.el
View file @
e175fabc
...
...
@@ -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
)))
...
...
lisp/org/ox.el
View file @
e175fabc
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment