[elpa] externals/org b923a23: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit b923a23221795bf0b8f218170f96b5394bc70ce7
Merge: e2cf436 d37e8a1
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

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

diff --git a/lisp/org.el b/lisp/org.el
index 8463c33..350d047 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19081,13 +19081,13 @@ Also align node properties according to 
`org-property-format'."
   (interactive)
   (unless (or (org-at-heading-p)
               (and (eq org-adapt-indentation 'headline-data)
-                   (not (org-at-clock-log-p))
+                   (not (or (org-at-clock-log-p)
+                            (org-at-planning-p)))
                    (save-excursion
                      (beginning-of-line 1)
                      (skip-chars-backward "\n")
                      (or (org-at-heading-p)
-                         (looking-back ":END:.*" (point-at-bol))
-                         (org-at-planning-p)))))
+                         (looking-back ":END:.*" (point-at-bol))))))
     (let* ((element (save-excursion (beginning-of-line) 
(org-element-at-point)))
           (type (org-element-type element)))
       (cond ((and (memq type '(plain-list item))