summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Wahl <marcowahlsoft@gmail.com>2018-06-06 16:05:26 +0200
committerMarco Wahl <marcowahlsoft@gmail.com>2018-06-06 16:05:26 +0200
commit13a09b3ba51e463656ee47d0375984c78972ee7b (patch)
treef7ec99aa783e2dfe70732bfd3742468ea9095e2e
parent8b9c1e15dfa24b19823d308cbd1ca6f629c048a9 (diff)
parent2b76aebfc638b430e769d6250f9e15f20e2e5694 (diff)
downloadorg-mode-13a09b3ba51e463656ee47d0375984c78972ee7b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el4
-rw-r--r--testing/lisp/test-org-element.el11
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 691aa21..fde0209 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -947,10 +947,10 @@ Assume point is at beginning of the headline."
(level (prog1 (org-reduced-level (skip-chars-forward "*"))
(skip-chars-forward " \t")))
(todo (and org-todo-regexp
- (let (case-fold-search) (looking-at org-todo-regexp))
+ (let (case-fold-search) (looking-at (concat org-todo-regexp " ")))
(progn (goto-char (match-end 0))
(skip-chars-forward " \t")
- (match-string 0))))
+ (match-string 1))))
(todo-type
(and todo (if (member todo org-done-keywords) 'done 'todo)))
(priority (and (looking-at "\\[#.\\][ \t]*")
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index d195ba6..d653a29 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1029,6 +1029,17 @@ Some other text
;;;; Headline
+(ert-deftest test-org-element/headline-todo-keyword ()
+ "Test todo keyword recognition."
+ ;; Reference test.
+ (org-test-with-temp-text "* TODO Headline"
+ (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
+ (should (org-element-property :todo-keyword (org-element-at-point)))))
+ ;; Todo keyword is prefix of headlines first word.
+ (org-test-with-temp-text "* TODOHeadline"
+ (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
+ (should-not (org-element-property :todo-keyword (org-element-at-point))))))
+
(ert-deftest test-org-element/headline-comment-keyword ()
"Test COMMENT keyword recognition."
;; Reference test.