From 18810580f51f35fb852c7dbfadcf4f49add56fcd Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 17 Jun 2010 10:27:58 -0700 Subject: [PATCH 1/2] removed 'cl functions from org-exp.el to assuage elisp compiler --- lisp/org-exp.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 919288ae1..361f172f3 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) From d75f20ffc2c32160928086845e3a8b25bbe76dbb Mon Sep 17 00:00:00 2001 From: Christian Egli Date: Thu, 17 Jun 2010 13:58:49 +0000 Subject: [PATCH 2/2] Newer Emacsen changed the API of start-process-shell-command and issue a warning if called with more than 3 args. --- lisp/ChangeLog | 6 ++++++ lisp/org-taskjuggler.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d351a8a03..f3ca66cf5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-06-17 Christian Egli + + * 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 * org-taskjuggler.el (org-export-taskjuggler-old-level): diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index f64138e20..01bfc47a9 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