Merge branch 'maint' into master

2020-10-27 00:05:03 -04:00 · 2020-10-27 00:05:03 -04:00 · 0d314a0473
parent e753766bc2 e8070d71ab
commit 0d314a0473
1 changed files with 2 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -6474,7 +6474,8 @@ Use `\\[org-edit-special]' to edit table.el tables"))
 	(goto-char eos)
 	(outline-next-heading)
 	(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
 	       (not (setq children-skipped
 			  org-cycle-skip-children-state-if-no-children))))