mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 18:10:43 +00:00
Merge branch 'master' of git://repo.or.cz/org-mode
This commit is contained in:
commit
2e46be747b
|
@ -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>
|
2010-06-08 Christian Egli <christian.egli@sbszh.ch>
|
||||||
|
|
||||||
* org-taskjuggler.el (org-export-taskjuggler-old-level):
|
* 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."
|
"Recursively include files aborting on circular inclusion."
|
||||||
(let ((now (list org-current-export-file)) all)
|
(let ((now (list org-current-export-file)) all)
|
||||||
(while now
|
(while now
|
||||||
(setq all (remove-duplicates (append now all)))
|
(setq all (append now all))
|
||||||
(setq now (org-export-handle-include-files))
|
(setq now (org-export-handle-include-files))
|
||||||
(let ((intersection
|
(let ((intersection
|
||||||
(delq nil
|
(delq nil
|
||||||
(mapcar
|
(mapcar (lambda (el) (when (member el all) el)) now))))
|
||||||
(lambda (el) (when (member el all) el))
|
(when intersection
|
||||||
now))))
|
|
||||||
(when (intersection now all)
|
|
||||||
(error "recursive #+INCLUDE: %S" intersection))))))
|
(error "recursive #+INCLUDE: %S" intersection))))))
|
||||||
|
|
||||||
(defun org-get-file-contents (file &optional prefix prefix1 markup)
|
(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
|
"Export the current buffer as a TaskJuggler file and open it
|
||||||
with the TaskJuggler GUI."
|
with the TaskJuggler GUI."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((file-name (buffer-file-name (org-export-as-taskjuggler)))
|
(let* ((file-name (buffer-file-name (org-export-as-taskjuggler)))
|
||||||
(command "TaskJugglerUI"))
|
(process-name "TaskJugglerUI")
|
||||||
(start-process-shell-command command nil command file-name)))
|
(command (concat process-name " " file-name)))
|
||||||
|
(start-process-shell-command process-name nil command)))
|
||||||
|
|
||||||
(defun org-taskjuggler-parent-is-ordered-p ()
|
(defun org-taskjuggler-parent-is-ordered-p ()
|
||||||
"Return true if the parent of the current node has a property
|
"Return true if the parent of the current node has a property
|
||||||
|
|
Loading…
Reference in a new issue