diff --git a/lisp/org.el b/lisp/org.el index 97fe25d31..1359f30b9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6290,11 +6290,15 @@ Use `\\[org-edit-special]' to edit table.el tables")) (setq eos (save-excursion (org-end-of-subtree t t) (when (bolp) (backward-char)) (point))) (setq has-children - (save-excursion - (let ((level (funcall outline-level))) - (outline-next-heading) - (and (org-at-heading-p t) - (> (funcall outline-level) level)))))) + (or + (save-excursion + (let ((level (funcall outline-level))) + (outline-next-heading) + (and (org-at-heading-p t) + (> (funcall outline-level) level)))) + (and (eq org-cycle-include-plain-lists 'integrate) + (save-excursion + (org-list-search-forward (org-item-beginning-re) eos t)))))) ;; Determine end invisible part of buffer (EOL) (beginning-of-line 2) (while (and (not (eobp)) ;This is like `next-line'.