Browse Source

Merge branch 'maint'

Nicolas Goaziou 3 years ago
parent
commit
9402aaebe7
2 changed files with 7 additions and 2 deletions
  1. 1 1
      lisp/org-element.el
  2. 6 1
      testing/lisp/test-org-element.el

+ 1 - 1
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)))

+ 6 - 1
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."