[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org e6d9b64 1/5: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org e6d9b64 1/5: Merge branch 'maint' |
Date: |
Tue, 27 Apr 2021 03:57:11 -0400 (EDT) |
branch: externals/org
commit e6d9b642c9a31edc73b74645d1418d2365ab6e39
Merge: bd10c31 26d1d29
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>
Merge branch 'maint'
---
lisp/org.el | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index ca8ef73..0dc5023 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18884,15 +18884,12 @@ ELEMENT."
((and
(eq org-adapt-indentation 'headline-data)
(or (memq type '(planning clock node-property property-drawer drawer))
- ;; FIXME: when storing a note in a LOGBOOK drawer,
+ ;; 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))))))
+ (eq (org-element-type (car (org-element-lineage element)))
'drawer)))
(org--get-expected-indentation
(org-element-property :parent element) t))
((memq type '(headline inlinetask nil))