branch: externals/org
commit cde2b1e999d99f37461cf04ab51089085206b9d7
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Revert "Clocktables: Indent inline tasks under their heading"
This reverts commit 629d08fa55c9515d93c01018a642c67d1d095fe0.
---
lisp/org-clock.el | 11 +++++------
testing/lisp/test-org-clock.el | 25 ++++++++++++-------------
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 753f1a2022..5422cef7bd 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -3208,12 +3208,11 @@ PROPERTIES: The list properties specified in the
`:properties' parameter
(if (eq 'headline (org-element-type elm))
(org-element-property :level elm)
;; inline task
- (1+
- (or (org-element-lineage-map elm
- (lambda (elm)
- (org-element-property :level elm))
- '(headline) nil t)
- 0))))
+ (or (org-element-lineage-map elm
+ (lambda (elm)
+ (org-element-property :level elm))
+ '(headline) nil t)
+ 1)))
(level (when (<= level maxlevel) level))
(title
(let ((headline (org-element-property :title elm)))
diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el
index 9ab8a1b67c..9992f1da6c 100644
--- a/testing/lisp/test-org-clock.el
+++ b/testing/lisp/test-org-clock.el
@@ -1668,12 +1668,12 @@ Variables'."
"Test insert clocktable on an inline task."
(should
(equal
- "| Headline | Time | |
-|--------------+--------+------|
-| *Total time* | *2:00* | |
-|--------------+--------+------|
-| H1 | 2:00 | |
-| \\_ I | | 2:00 |"
+ "| Headline | Time |
+|--------------+--------|
+| *Total time* | *2:00* |
+|--------------+--------|
+| H1 | 2:00 |
+| I | 2:00 |"
(let ((org-inlinetask-min-level 5))
(org-test-with-temp-text "* H1
***** I
@@ -1706,13 +1706,12 @@ foo"
"Test open clocks on an inline task.
Open clocks should be ignored unless it is clocked in and
`org-clock-report-include-clocking-task' is t."
- (let ((time-reported
- "| Headline | Time | |
-|--------------+--------+------|
-| *Total time* | *1:00* | |
-|--------------+--------+------|
-| H1 | 1:00 | |
-| \\_ I | | 1:00 |")
+ (let ((time-reported "| Headline | Time |
+|--------------+--------|
+| *Total time* | *1:00* |
+|--------------+--------|
+| H1 | 1:00 |
+| I | 1:00 |")
(time-not-reported "| Headline | Time |
|--------------+--------|
| *Total time* | *0:00* |")
