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

[ELPA Syncer]

branch: externals/org
commit bd10c31e7073ebc6b10e4070b7c6d32e8e3e46b1
Merge: c93066d 730a05f
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>

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

diff --git a/lisp/org.el b/lisp/org.el
index 3f9c9a2..ca8ef73 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7424,7 +7424,9 @@ Assume point is at a heading or an inlinetask beginning."
           (col (+ (current-indentation) diff)))
        (when (wholenump col)
         (while (< (point) end-marker)
-          (indent-line-to col)
+           (if (natnump diff)
+              (insert (make-string diff 32))
+             (delete-char (abs diff)))
           (forward-line)))))
    (catch 'no-shift
      (when (or (zerop diff) (not (eq org-adapt-indentation t)))
@@ -18881,7 +18883,16 @@ ELEMENT."
          (current-indentation))))
       ((and
        (eq org-adapt-indentation 'headline-data)
-       (memq type '(planning clock node-property property-drawer drawer)))
+        (or (memq type '(planning clock node-property property-drawer drawer))
+            ;; FIXME: when storing a note in a LOGBOOK drawer,
+            ;; `org-store-log-note' needs to insert a new line before
+            ;; the newly inserted note, thus the `type' at point will
+            ;; return `paragraph' instead of the expected `drawer', so
+            ;; we need to manually detect the drawer.
+            (and (looking-at-p "^$")
+                 (save-excursion
+                   (backward-char)
+                   (looking-back org-drawer-regexp (point-at-bol))))))
        (org--get-expected-indentation
        (org-element-property :parent element) t))
       ((memq type '(headline inlinetask nil))