tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-06-09 11:30:51 +02:00
parent efccedbf65 56b864b265
commit 8e9c10ada4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ox-html.el
View File

@ -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