Merge branch 'maint'

Conflicts: lisp/org-element.el
2014-02-01 23:33:58 +01:00 · 2014-02-01 23:33:58 +01:00 · dda9461fbb
parent 8b1ffc717b 8e1386cead
commit dda9461fbb
1 changed files with 2 additions and 2 deletions
--- 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.