forked from mirrors/org-mode
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
af90fb1e4c
|
@ -1,3 +1,9 @@
|
|||
2010-06-17 Christian Egli <christian.egli@sbszh.ch>
|
||||
|
||||
* org-taskjuggler.el (org-export-as-taskjuggler-and-open): Fix
|
||||
the invocation of start-process-shell-command to avoid
|
||||
warnings in newer Emacsen
|
||||
|
||||
2010-06-08 Christian Egli <christian.egli@sbszh.ch>
|
||||
|
||||
* org-taskjuggler.el (org-export-taskjuggler-old-level):
|
||||
|
|
|
@ -2005,14 +2005,12 @@ TYPE must be a string, any of:
|
|||
"Recursively include files aborting on circular inclusion."
|
||||
(let ((now (list org-current-export-file)) all)
|
||||
(while now
|
||||
(setq all (remove-duplicates (append now all)))
|
||||
(setq all (append now all))
|
||||
(setq now (org-export-handle-include-files))
|
||||
(let ((intersection
|
||||
(delq nil
|
||||
(mapcar
|
||||
(lambda (el) (when (member el all) el))
|
||||
now))))
|
||||
(when (intersection now all)
|
||||
(mapcar (lambda (el) (when (member el all) el)) now))))
|
||||
(when intersection
|
||||
(error "recursive #+INCLUDE: %S" intersection))))))
|
||||
|
||||
(defun org-get-file-contents (file &optional prefix prefix1 markup)
|
||||
|
|
|
@ -326,9 +326,10 @@ defined in `org-export-taskjuggler-default-reports'."
|
|||
"Export the current buffer as a TaskJuggler file and open it
|
||||
with the TaskJuggler GUI."
|
||||
(interactive)
|
||||
(let ((file-name (buffer-file-name (org-export-as-taskjuggler)))
|
||||
(command "TaskJugglerUI"))
|
||||
(start-process-shell-command command nil command file-name)))
|
||||
(let* ((file-name (buffer-file-name (org-export-as-taskjuggler)))
|
||||
(process-name "TaskJugglerUI")
|
||||
(command (concat process-name " " file-name)))
|
||||
(start-process-shell-command process-name nil command)))
|
||||
|
||||
(defun org-taskjuggler-parent-is-ordered-p ()
|
||||
"Return true if the parent of the current node has a property
|
||||
|
|
Loading…
Reference in a new issue