ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/ox.el
This commit is contained in:
Nicolas Goaziou 2014-04-21 09:50:10 +02:00
parent 3e401117fd b983048b73
commit 4c0a29edec
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/org.texi
View File

@ -10427,10 +10427,10 @@ export dispatcher with the following key combinations:
Toggle asynchronous export. Asynchronous export uses an external Emacs
process that is configured with a specified initialization file.
While exporting asynchronously, the output is not displayed. It is stored in
a list called ``the export stack'', and can be viewed from there. The stack
can be reached by calling the dispatcher with a double @kbd{C-u} prefix
argument, or with @kbd{&} key from the dispatcher.
While exporting asynchronously, the output is not displayed, but stored in
a place called ``the export stack''. This stack can be displayed by calling
the dispatcher with a double @kbd{C-u} prefix argument, or with @kbd{&} key
from the dispatcher menu.
@vindex org-export-in-background
To make this behavior the default, customize the variable

3
lisp/ox.el
View File

@ -818,7 +818,8 @@ HTML code while every other back-end will ignore it."
:type 'coding-system)
(defcustom org-export-copy-to-kill-ring nil
"Should we push exported content to the kill ring?"
"Non-nil means pushing export output to the kill ring.
This variable is ignored during asynchronous export."
:group 'org-export-general
:version "25.1"
:package-version '(Org . "8.3")