Merge branch 'maint' into master

This commit is contained in:
Kyle Meyer 2020-10-27 00:05:03 -04:00
commit 0d314a0473
1 changed files with 2 additions and 1 deletions

View File

@ -6474,7 +6474,8 @@ Use `\\[org-edit-special]' to edit table.el tables"))
(goto-char eos) (goto-char eos)
(outline-next-heading) (outline-next-heading)
(when (org-invisible-p) (org-flag-heading nil)))) (when (org-invisible-p) (org-flag-heading nil))))
((and (>= eol eos) ((and (or (>= eol eos)
(not (string-match "\\S-" (buffer-substring eol eos))))
(or has-children (or has-children
(not (setq children-skipped (not (setq children-skipped
org-cycle-skip-children-state-if-no-children)))) org-cycle-skip-children-state-if-no-children))))