Re: [PATCH] lisp/ob.el (org-babel-result-cond)

[Achim Gratz <Stromeko@nexgo.de>]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

Eric Schulte writes:
> I'd like to apply this patch, however the format is not detected by git
> am.  Could you re-generate this patch using git format-patch and attach
> the resulting file?

Here it is:


[-- Attachment #2: 0001-org-babel-fix-bug-introduced-in-commit-78cdf149.patch --]
[-- Type: text/x-patch, Size: 1564 bytes --]

From d91ba35d143b806f9d615a93f34a10b4086f55a5 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Fri, 7 Dec 2012 20:48:24 +0100
Subject: [PATCH 1/4] org-babel: fix bug introduced in commit 78cdf149
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/ob.el (org-babel-result-cond): Macro expansion needs to unquote
  formal parameter `result-params´.
---
 lisp/ob.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/ob.el b/lisp/ob.el
index 0aba523..2f4f855 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -2567,14 +2567,14 @@ (defvar org-babel-temporary-directory)
 (defmacro org-babel-result-cond (result-params scalar-form &rest table-forms)
   "Call the code to parse raw string results according to RESULT-PARAMS."
   (declare (indent 1))
-  `(unless (member "none" result-params)
-     (if (or (member "scalar" result-params)
-	     (member "verbatim" result-params)
-	     (member "html" result-params)
-	     (member "code" result-params)
-	     (member "pp" result-params)
-	     (and (member "output" result-params)
-		  (not (member "table" result-params))))
+  `(unless (member "none" ,result-params)
+     (if (or (member "scalar" ,result-params)
+	     (member "verbatim" ,result-params)
+	     (member "html" ,result-params)
+	     (member "code" ,result-params)
+	     (member "pp" ,result-params)
+	     (and (member "output" ,result-params)
+		  (not (member "table" ,result-params))))
 	 ,scalar-form
        ,@table-forms)))
 
-- 
1.8.0.1


[-- Attachment #3: Type: text/plain, Size: 201 bytes --]



Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Waldorf MIDI Implementation & additional documentation:
http://Synth.Stromeko.net/Downloads.html#WaldorfDocs