diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-18 09:51:36 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-18 09:51:36 +0200 |
| commit | af90fb1e4cac9c447c028a47d812a29cc8716a74 (patch) | |
| tree | 49c000b066c6285dd4d45cbb16b33bc9b5bf7dbb | |
| parent | 42ea7d35b7e214dc5e026be468a40c29d30ba14c (diff) | |
| parent | d75f20ffc2c32160928086845e3a8b25bbe76dbb (diff) | |
| download | org-mode-af90fb1e4cac9c447c028a47d812a29cc8716a74.tar.gz | |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org-exp.el | 8 | ||||
| -rw-r--r-- | lisp/org-taskjuggler.el | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d351a8a..f3ca66c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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): diff --git a/lisp/org-exp.el b/lisp/org-exp.el index cd979c7..029e4d7 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -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) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index f64138e..01bfc47 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -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 |