summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-06-09 11:30:51 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2013-06-09 11:30:51 +0200
commit8e9c10ada453c1964e9e52d2badb8181732ddbde (patch)
treed6ffcb86964d13f027f6f868b95482d5c00df5a8
parentefccedbf653d1edabc923c6b8723578cebffc00d (diff)
parent56b864b265ea25110a0e3afa85c178bd5edbb84e (diff)
downloadorg-mode-8e9c10ada453c1964e9e52d2badb8181732ddbde.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-html.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index facd84c..365802f 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2093,7 +2093,7 @@ channel."
CONTENTS is nil. INFO is a plist holding contextual
information."
(format (or (cdr (assq 'code org-html-text-markup-alist)) "%s")
- (org-html-plain-text (org-element-property :value code) info)))
+ (org-html-encode-plain-text (org-element-property :value code))))
;;;; Drawer
@@ -3225,7 +3225,7 @@ holding contextual information."
CONTENTS is nil. INFO is a plist holding contextual
information."
(format (or (cdr (assq 'verbatim org-html-text-markup-alist)) "%s")
- (org-html-plain-text (org-element-property :value verbatim) info)))
+ (org-html-encode-plain-text (org-element-property :value verbatim))))
;;;; Verse Block