Merge branch 'maint'

2014-03-22 00:28:30 +01:00 · 2014-03-22 00:28:30 +01:00 · 368aa1078f
parent d6d1f25429 b399ff0cba
commit 368aa1078f
2 changed files with 2 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -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)
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@ -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.