0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 20:46:27 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-10-23 18:29:06 +02:00
commit f3ae90c6c5

View file

@ -800,7 +800,9 @@ a unique id will be associated to it."
(if (eq (org-element-property :todo-type task) 'done) "100" (if (eq (org-element-property :todo-type task) 'done) "100"
(org-element-property :COMPLETE task))) (org-element-property :COMPLETE task)))
(depends (org-taskjuggler-resolve-dependencies task info)) (depends (org-taskjuggler-resolve-dependencies task info))
(effort (org-element-property :EFFORT task)) (effort (let ((property
(intern (concat ":" (upcase org-effort-property)))))
(org-element-property property task)))
(milestone (milestone
(or (org-element-property :MILESTONE task) (or (org-element-property :MILESTONE task)
(not (or (org-element-map (org-element-contents task) 'headline (not (or (org-element-map (org-element-contents task) 'headline