summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2014-02-01 23:33:58 +0100
committerNicolas Goaziou <n.goaziou@gmail.com>2014-02-01 23:33:58 +0100
commitdda9461fbbc3346ef8cd5ae237d647c84178927a (patch)
treedc16d27be333c381fe9dc1f0a5f802f6518dce91
parent8b1ffc717bbad83a9e0df644583c9b7945b59774 (diff)
parent8e1386cead0e4296f7bb063d07d64dd95ec0b231 (diff)
downloadorg-mode-dda9461fbbc3346ef8cd5ae237d647c84178927a.tar.gz
Merge branch 'maint'
Conflicts: lisp/org-element.el
-rw-r--r--lisp/org-element.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index e69c3d0..9502de5 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4467,8 +4467,8 @@ Return Org syntax as a string."
(lambda (obj)
(org-element--interpret-data-1 obj parent pseudo-objects))
(org-element-contents data) ""))
- ;; Plain text: remove `:parent' text property from output.
- ((stringp data) (org-no-properties data))
+ ;; Plain text: return it.
+ ((stringp data) data)
;; Element or object without contents.
((not (org-element-contents data)) (funcall interpret data nil))
;; Element or object with contents.