summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-01-29 21:44:05 +0100
committerBastien <bzg@gnu.org>2020-01-29 21:44:05 +0100
commitdb3758da92b07e1eeed4d147e89711062ba61cf4 (patch)
treead19ceaf8495a6a62a8e96f0fe6e9d9d023bca60
parent0aff90f499f307bc2a5e4255ceb5f424b4a155f4 (diff)
parentc2aebcee273b23185bb0263013e2ea9f683b6032 (diff)
downloadorg-mode-db3758da92b07e1eeed4d147e89711062ba61cf4.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d4e1753..61a96f3 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6440,13 +6440,11 @@ 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
- (or (save-excursion
- (let ((level (funcall outline-level)))
- (outline-next-heading)
- (and (org-at-heading-p t)
- (> (funcall outline-level) level))))
- (save-excursion
- (org-list-search-forward (org-item-beginning-re) eos t)))))
+ (save-excursion
+ (let ((level (funcall outline-level)))
+ (outline-next-heading)
+ (and (org-at-heading-p t)
+ (> (funcall outline-level) level))))))
;; Determine end invisible part of buffer (EOL)
(beginning-of-line 2)
(while (and (not (eobp)) ;This is like `next-line'.