Re: [Patch] ob-ditaa.el for Cygwin

[Yujie Wen <yjwen.ty@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 438 bytes --]

Hi,

  I re-created the patch file by the instruction on "How to contribute to
Org".

  Could someone please take a look and, if it is satisfactory, please help
to apply it?

  I am used to Orgmode under Cygwin and sometimes uses ditaa for drawing
diagrams. But without this patch, I have to switch to Windows native Emacs
for calling ditaa.

  Many thanks

Regards,
Yujie


2013/7/12 Jambunathan K <kjambunathan@gmail.com>

>
> Sorry.
>

[-- Attachment #1.2: Type: text/html, Size: 863 bytes --]

[-- Attachment #2: 0001-ditaa-for-cygwin-with-Windows-native-Java-VM.patch --]
[-- Type: application/octet-stream, Size: 1895 bytes --]

From c32305315ee0d0f3dd4e7a614607a5af08983143 Mon Sep 17 00:00:00 2001
From: yjwen <yjwen.ty@gmail.com>
Date: Tue, 16 Jul 2013 09:14:45 +0800
Subject: [PATCH] ditaa for cygwin with Windows native Java VM.

---
 lisp/ob-ditaa.el |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index d3d76e5..63967de 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -86,13 +86,29 @@ This function is called by `org-babel-execute-src-block'."
 	 (java (cdr (assoc :java params)))
 	 (in-file (org-babel-temp-file "ditaa-"))
 	 (eps (cdr (assoc :eps params)))
+	 (jar-file-name (shell-quote-argument
+			 (expand-file-name
+			  (if eps org-ditaa-eps-jar-path org-ditaa-jar-path))))
+	 (emacs-p (string-match "cygwin" (emacs-version)))
+	 (jar-file-name-wrapped
+	  (if emacs-p
+	      ;; Cygwin doesn't have Jave, have to use Windows native Java.
+	      ;; So Cygwin paths must be converted to Windows paths.
+	      (format "`cygpath -w %s`" jar-file-name)
+	    jar-file-name))
+	 (in-file-wrapped
+	  (if emacs-p
+	      (format "`cygpath -w %s`" (org-babel-process-file-name in-file))
+	    (org-babel-process-file-name in-file)))
+	 (out-file-wrapped
+	  (if emacs-p
+	      (format "`cygpath -w %s`" (org-babel-process-file-name out-file))
+	    (org-babel-process-file-name out-file)))
 	 (cmd (concat "java " java " " org-ditaa-jar-option " "
-		      (shell-quote-argument
-		       (expand-file-name
-			(if eps org-ditaa-eps-jar-path org-ditaa-jar-path)))
+		      jar-file-name-wrapped
 		      " " cmdline
-		      " " (org-babel-process-file-name in-file)
-		      " " (org-babel-process-file-name out-file)))
+		      " " in-file-wrapped
+		      " " out-file-wrapped))
 	 (pdf-cmd (when (and (or (string= (file-name-extension out-file) "pdf")
 				 (cdr (assoc :pdf params))))
 		    (concat
-- 
1.7.9