mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:00:49 +00:00
org-element: Fix interpretation as todo kwd when prefix of headline
* lisp/org-element.el (org-element-headline-parser): Check for space after todo-kwd. * testing/lisp/test-org-element.el (test-org-element/headline-todo-keyword): Respective tests.
This commit is contained in:
parent
8fbdf0ce1a
commit
2b76aebfc6
|
@ -931,10 +931,10 @@ Assume point is at beginning of the headline."
|
||||||
(level (prog1 (org-reduced-level (skip-chars-forward "*"))
|
(level (prog1 (org-reduced-level (skip-chars-forward "*"))
|
||||||
(skip-chars-forward " \t")))
|
(skip-chars-forward " \t")))
|
||||||
(todo (and org-todo-regexp
|
(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))
|
(progn (goto-char (match-end 0))
|
||||||
(skip-chars-forward " \t")
|
(skip-chars-forward " \t")
|
||||||
(match-string 0))))
|
(match-string 1))))
|
||||||
(todo-type
|
(todo-type
|
||||||
(and todo (if (member todo org-done-keywords) 'done 'todo)))
|
(and todo (if (member todo org-done-keywords) 'done 'todo)))
|
||||||
(priority (and (looking-at "\\[#.\\][ \t]*")
|
(priority (and (looking-at "\\[#.\\][ \t]*")
|
||||||
|
|
|
@ -1014,6 +1014,17 @@ Some other text
|
||||||
|
|
||||||
;;;; Headline
|
;;;; 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 ()
|
(ert-deftest test-org-element/headline-comment-keyword ()
|
||||||
"Test COMMENT keyword recognition."
|
"Test COMMENT keyword recognition."
|
||||||
;; Reference test.
|
;; Reference test.
|
||||||
|
|
Loading…
Reference in a new issue