[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 5e534ae 3/4: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 5e534ae 3/4: Merge branch 'maint' |
Date: |
Mon, 3 May 2021 10:57:13 -0400 (EDT) |
branch: externals/org
commit 5e534aecaa6caae1b96ea271e991c7a9b63f29b8
Merge: 546d35a de93bf0
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
Merge branch 'maint'
---
lisp/org.el | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index eac5078..f3a33d8 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18924,17 +18924,6 @@ ELEMENT."
(t
(goto-char start)
(current-indentation))))
- ((and
- (eq org-adapt-indentation 'headline-data)
- (or (memq type '(planning clock node-property property-drawer 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.
- (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))
(if (org-match-line "[ \t]*$")
(org--get-expected-indentation element t)
@@ -19078,11 +19067,12 @@ 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))
(save-excursion
(beginning-of-line 1)
(skip-chars-backward "\n")
(or (org-at-heading-p)
- (org-at-drawer-p)
+ (looking-back ":END:.*")
(org-at-planning-p)))))
(let* ((element (save-excursion (beginning-of-line)
(org-element-at-point)))
(type (org-element-type element)))