summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-10-16 23:20:57 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-10-16 23:20:57 +0200
commit707fbc37781eea123e70f1c27062a26374e61ef4 (patch)
treed0648e998984a39b2ed7bf1ce05354cc79904fbb
parentfcb75f322a07c56762fa82f1519b6ea153d8e715 (diff)
parent9de1ee1b6fa5099f344c973881597012a06a9138 (diff)
downloadorg-mode-707fbc37781eea123e70f1c27062a26374e61ef4.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el1
-rw-r--r--testing/lisp/test-org-element.el19
2 files changed, 16 insertions, 4 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index aee0943..834756e 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4150,6 +4150,7 @@ otherwise. Modes can be either `first-section', `item',
(if parentp
(pcase type
(`headline 'section)
+ (`inlinetask 'planning)
(`plain-list 'item)
(`property-drawer 'node-property)
(`section 'planning)
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index a23001b..89cb1bd 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1221,17 +1221,28 @@ Contents
;; Planning info.
(should
(org-test-with-temp-text "
-*************** Task
+*************** Task<point>
DEADLINE: <2012-03-29 thu.>
*************** END"
- (forward-line)
(org-element-property :deadline (org-element-at-point))))
+ (should
+ (eq 'planning
+ (org-test-with-temp-text "
+*************** Task
+<point>DEADLINE: <2012-03-29 thu.>
+*************** END"
+ (org-element-type (org-element-at-point)))))
(should-not
(org-test-with-temp-text "
-*************** Task
+*************** Task<point>
DEADLINE: <2012-03-29 thu.>"
- (forward-line)
(org-element-property :deadline (org-element-at-point))))
+ (should-not
+ (eq 'planning
+ (org-test-with-temp-text "
+*************** Task
+<point>DEADLINE: <2012-03-29 thu.>"
+ (org-element-type (org-element-at-point)))))
;; Priority.
(should
(eq