Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2014-09-07 00:44:33 +02:00
commit 59d2f28024
1 changed files with 2 additions and 1 deletions

View File

@ -2896,7 +2896,8 @@ the plist used as a communication channel."
(org-export-read-attribute :attr_html paragraph)))
(extra (or (cadr (assoc parent-type style)) "")))
(cond
((and (not (org-export-get-previous-element paragraph info))
((and (eq parent-type 'item)
(not (org-export-get-previous-element paragraph info))
(let ((followers (org-export-get-next-element paragraph info 2)))
(and (not (cdr followers))
(memq (org-element-type (car followers)) '(nil plain-list)))))