mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-02 08:22:16 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Bastien Guerry 2014-03-22 00:28:30 +01:00
commit 368aa1078f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org.el
View File

@ -3973,6 +3973,7 @@ header, or they will be appended."
("" "wrapfig" nil)
("" "rotating" nil)
("normalem" "ulem" t)
("" "soul" t)
("" "amsmath" t)
("" "textcomp" t)
("" "marvosym" t)

2
lisp/ox-latex.el
View File

@ -605,7 +605,7 @@ When nil, no transformation is made."
(code . verb)
(italic . "\\emph{%s}")
(strike-through . "\\sout{%s}")
(underline . "\\uline{%s}")
(underline . "\\ul{%s}")
(verbatim . protectedtexttt))
"Alist of LaTeX expressions to convert text markup.