tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Christian Egli 2014-11-06 09:17:34 +01:00
parent 588ec53124 2917bcff35
commit e8a2f33519
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/lisp/ox-taskjuggler.el
View file

@ -64,7 +64,7 @@
;; should end up with something similar to the example by Peter Jones ;; should end up with something similar to the example by Peter Jones
;; in: ;; in:
;; ;;
;; http://www.contextualdevelopment.com/static/artifacts/articles/2008/project-planning/project-planning.org. ;; http://www.devalot.com/assets/articles/2008/07/project-planning/project-planning.org.
;; ;;
;; Now mark the top node of your tasks with a tag named ;; Now mark the top node of your tasks with a tag named
;; "taskjuggler_project" (or whatever you customized ;; "taskjuggler_project" (or whatever you customized
@ -307,7 +307,10 @@ but before any resource and task declarations."
startbuffer startcredit statusnote chargeset charge) startbuffer startcredit statusnote chargeset charge)
"Valid attributes for Taskjuggler tasks. "Valid attributes for Taskjuggler tasks.
If one of these appears as a property for a headline, it will be If one of these appears as a property for a headline, it will be
exported with the corresponding task." exported with the corresponding task.
Note that multiline properties are not supported, so attributes
like note or journalentry have to be on a single line."
:group 'org-export-taskjuggler) :group 'org-export-taskjuggler)
(defcustom org-taskjuggler-valid-project-attributes (defcustom org-taskjuggler-valid-project-attributes
@ -600,7 +603,7 @@ doesn't include leading \"depends\"."
(let ((id (org-element-property :TASK_ID dep))) (let ((id (org-element-property :TASK_ID dep)))
(and id (and id
(string-match (concat id " +\\({.*?}\\)") dep-str) (string-match (concat id " +\\({.*?}\\)") dep-str)
(org-match-string-no-properties 1)))) (org-match-string-no-properties 1 dep-str))))
path) path)
;; Compute number of exclamation marks by looking for the ;; Compute number of exclamation marks by looking for the
;; common ancestor between TASK and DEP. ;; common ancestor between TASK and DEP.