mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-04-05 09:51:36 +02:00
parent 957177cebc 7de492a0c4
commit a36dde7c68
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lisp/org.el
View File

@ -4004,10 +4004,18 @@ Org mode to function properly:
Therefore you should not modify this variable unless you know
what you are doing. The one reason to change it anyway is that
you might be loading some other package that conflicts with one
of the default packages. Each cell is of the format
\( \"options\" \"package\" snippet-flag). If SNIPPET-FLAG is t,
the package also needs to be included when compiling LaTeX
snippets into images for inclusion into non-LaTeX output."
of the default packages. Each element is either a cell or
a string.
A cell is of the format:
\( \"options\" \"package\" SNIPPET-FLAG).
If SNIPPET-FLAG is non-nil, the package also needs to be included
when compiling LaTeX snippets into images for inclusion into
non-LaTeX output.
A string will be inserted as-is in the header of the document."
:group 'org-latex
:group 'org-export-latex
:set 'org-set-packages-alist
@ -4025,18 +4033,22 @@ snippets into images for inclusion into non-LaTeX output."
"Alist of packages to be inserted in every LaTeX header.
These will be inserted after `org-latex-default-packages-alist'.
Each cell is of the format:
Each element is either a cell or a string.
\(\"options\" \"package\" snippet-flag)
A cell is of the format:
SNIPPET-FLAG, when t, indicates that this package is also needed
when turning LaTeX snippets into images for inclusion into
\(\"options\" \"package\" SNIPPET-FLAG)
SNIPPET-FLAG, when non-nil, indicates that this package is also
needed when turning LaTeX snippets into images for inclusion into
non-LaTeX output.
A string will be inserted as-is in the header of the document.
Make sure that you only list packages here which:
- you want in every file
- do not conflict with the setup in `org-format-latex-header'.
- you want in every file;
- do not conflict with the setup in `org-format-latex-header';
- do not conflict with the default packages in
`org-latex-default-packages-alist'."
:group 'org-latex