[elpa] externals/org 9402aae: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 9402aaebe77c104ff2d6a87d6e8211f1af22e525
Merge: f918ba1 bc3ed23
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-element.el              | 2 +-
 testing/lisp/test-org-element.el | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 5bac89e..a675bf5 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4662,7 +4662,7 @@ to interpret.  Return Org syntax as a string."
                                   (eq (org-element-property :pre-blank parent)
                                       0)))))
                          ""))))))
-               (if (memq type '(org-data plain-text nil)) results
+               (if (memq type '(org-data nil)) results
                  ;; Build white spaces.  If no `:post-blank' property
                  ;; is specified, assume its value is 0.
                  (let ((blank (or (org-element-property :post-blank data) 0)))
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 9003b3c..4f10875 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -2613,7 +2613,12 @@ Outside list"
          (org-element-interpret-data
           '(center nil
                    (pseudo-element (:post-blank 1) (paragraph nil "A"))
-                   (paragraph nil "B"))))))
+                   (paragraph nil "B")))))
+  ;; Obey post-blank property in strings.
+  (should
+   (equal "A "
+         (org-element-interpret-data
+           (org-element-put-property "A" :post-blank 1)))))
 
 (ert-deftest test-org-element/center-block-interpreter ()
   "Test center block interpreter."