From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: [PATCH] lisp/ob.el (org-babel-result-cond) Date: Tue, 11 Dec 2012 19:21:21 +0100 Message-ID: <87d2ygzbz2.fsf@Rainer.invalid> References: <877gotiqnp.fsf@Rainer.invalid> <87txrsmpy1.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:57960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiUSq-00050y-DW for emacs-orgmode@gnu.org; Tue, 11 Dec 2012 13:22:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiUSa-0002nN-Gx for emacs-orgmode@gnu.org; Tue, 11 Dec 2012 13:21:56 -0500 Received: from plane.gmane.org ([80.91.229.3]:44488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiUSa-0002ma-AK for emacs-orgmode@gnu.org; Tue, 11 Dec 2012 13:21:40 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TiUSl-000468-1r for emacs-orgmode@gnu.org; Tue, 11 Dec 2012 19:21:51 +0100 Received: from pd9eb2efa.dip.t-dialin.net ([217.235.46.250]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 11 Dec 2012 19:21:51 +0100 Received: from Stromeko by pd9eb2efa.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 11 Dec 2012 19:21:51 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain 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: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-org-babel-fix-bug-introduced-in-commit-78cdf149.patch Content-Transfer-Encoding: 8bit >From d91ba35d143b806f9d615a93f34a10b4086f55a5 Mon Sep 17 00:00:00 2001 From: Achim Gratz 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 --=-=-= Content-Type: text/plain 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 --=-=-=--