Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-10 00:01:20 +02:00
commit b55d0d0162
2 changed files with 7 additions and 3 deletions

View file

@ -15699,8 +15699,9 @@ strings."
props))
(when specific (throw 'exit props)))
(when (or (not specific) (string= specific "TODO"))
(when (and (looking-at org-todo-line-regexp) (match-end 2))
(push (cons "TODO" (org-match-string-no-properties 2)) props))
(let ((case-fold-search nil))
(when (and (looking-at org-todo-line-regexp) (match-end 2))
(push (cons "TODO" (org-match-string-no-properties 2)) props)))
(when specific (throw 'exit props)))
(when (or (not specific) (string= specific "PRIORITY"))
(when (looking-at org-priority-regexp)

View file

@ -3320,7 +3320,7 @@ Paragraph<point>"
(equal "* H"
(org-test-with-temp-text "* TODO H"
(cdr (assoc "ITEM" (org-entry-properties))))))
;; Get "TODO" property.
;; Get "TODO" property. TODO keywords are case sensitive.
(should
(equal "TODO"
(org-test-with-temp-text "* TODO H"
@ -3332,6 +3332,9 @@ Paragraph<point>"
(should-not
(org-test-with-temp-text "* H"
(assoc "TODO" (org-entry-properties nil "TODO"))))
(should-not
(org-test-with-temp-text "* todo H"
(assoc "TODO" (org-entry-properties nil "TODO"))))
;; Get "PRIORITY" property.
(should
(equal "A"