From de93bf02bffe3b63d5710894e5fa2e314768391e Mon Sep 17 00:00:00 2001 From: Bastien Date: Mon, 3 May 2021 16:25:24 +0200 Subject: [PATCH] lisp/org.el: More fixes to `org-indent-line' * lisp/org.el (org-indent-line): Fixes indentation. (org--get-expected-indentation): Don't handle the 'headline-data value for `org-adapt-indentation' here, it is taken care upstream in `org-indent-line'. --- lisp/org.el | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index c0b5ee5ec..c20539a8a 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18846,17 +18846,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) @@ -19000,11 +18989,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)))