Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-09-22 21:33:55 +02:00
commit 256fefa9d7
1 changed files with 4 additions and 3 deletions

View File

@ -116,9 +116,10 @@ Assume BACKEND is `md'."
e :post-blank e :post-blank
(if (and (eq (org-element-type e) 'paragraph) (if (and (eq (org-element-type e) 'paragraph)
(eq (org-element-type (org-element-property :parent e)) 'item) (eq (org-element-type (org-element-property :parent e)) 'item)
(eq (org-element-type (org-export-get-next-element e info)) (not (org-export-get-previous-element e info))
'plain-list) (let ((next (org-export-get-next-element e info)))
(not (org-export-get-previous-element e info))) (and (eq (org-element-type next) 'plain-list)
(not (org-export-get-next-element next info)))))
0 0
1)))) 1))))
;; Return updated tree. ;; Return updated tree.