ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-09-29 08:57:08 +02:00
parent f155f5458e 9c92312d92
commit dadc875d9f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-element.el
View File

@ -718,10 +718,12 @@ Assume point is at beginning of the headline."
(raw-value (or (nth 4 components) "")) (raw-value (or (nth 4 components) ""))
(quotedp (quotedp
(let ((case-fold-search nil)) (let ((case-fold-search nil))
(string-match (format "^%s +" org-quote-string) raw-value))) (string-match (format "^%s\\( \\|$\\)" org-quote-string)
raw-value)))
(commentedp (commentedp
(let ((case-fold-search nil)) (let ((case-fold-search nil))
(string-match (format "^%s +" org-comment-string) raw-value))) (string-match (format "^%s\\( \\|$\\)" org-comment-string)
raw-value)))
(archivedp (member org-archive-tag tags)) (archivedp (member org-archive-tag tags))
(footnote-section-p (and org-footnote-section (footnote-section-p (and org-footnote-section
(string= org-footnote-section raw-value))) (string= org-footnote-section raw-value)))

8
testing/lisp/test-org-element.el
View File

@ -751,6 +751,10 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01"
(org-test-with-temp-text "* TODO QUOTE Headline" (org-test-with-temp-text "* TODO QUOTE Headline"
(let ((org-quote-string "QUOTE") (let ((org-quote-string "QUOTE")
(org-todo-keywords '((sequence "TODO" "DONE")))) (org-todo-keywords '((sequence "TODO" "DONE"))))
(should (org-element-property :quotedp (org-element-at-point)))))
;; With the keyword only.
(org-test-with-temp-text "* QUOTE"
(let ((org-quote-string "QUOTE"))
(should (org-element-property :quotedp (org-element-at-point)))))) (should (org-element-property :quotedp (org-element-at-point))))))
(ert-deftest test-org-element/headline-comment-keyword () (ert-deftest test-org-element/headline-comment-keyword ()
@ -773,6 +777,10 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01"
(org-test-with-temp-text "* TODO COMMENT Headline" (org-test-with-temp-text "* TODO COMMENT Headline"
(let ((org-comment-string "COMMENT") (let ((org-comment-string "COMMENT")
(org-todo-keywords '((sequence "TODO" "DONE")))) (org-todo-keywords '((sequence "TODO" "DONE"))))
(should (org-element-property :commentedp (org-element-at-point)))))
;; With the keyword only.
(org-test-with-temp-text "* COMMENT"
(let ((org-comment-string "COMMENT"))
(should (org-element-property :commentedp (org-element-at-point)))))) (should (org-element-property :commentedp (org-element-at-point))))))
(ert-deftest test-org-element/headline-archive-tag () (ert-deftest test-org-element/headline-archive-tag ()