[elpa] externals/org c67413a 2/2: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit c67413a7b67105e8659980afa8aa1c226719f33d
Merge: d3b6cdb 5584ffc
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 lisp/org.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index c0622ca..10eeae5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20964,7 +20964,11 @@ See `org-backward-paragraph'."
          (cond
           ;; There is a blank line above.  Move there.
           ((and (org-previous-line-empty-p)
-                (not (org-invisible-p (1- (line-end-position 0)))))
+                 (let ((lep (line-end-position 0)))
+                   ;; When the first headline start at point 2, don't choke 
while
+                   ;; checking with `org-invisible-p'.
+                   (or (= lep 1)
+                      (not (org-invisible-p (1- (line-end-position 0)))))))
            (forward-line -1))
           ;; At the beginning of the first element within a greater
           ;; element.  Move to the beginning of the greater element.