From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: [PATCH] lisp/ob.el (org-babel-result-cond) Date: Fri, 07 Dec 2012 20:54:50 +0100 Message-ID: <877gotiqnp.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:47412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th40u-0003qI-Vc for emacs-orgmode@gnu.org; Fri, 07 Dec 2012 14:55:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th40o-0001a1-Kt for emacs-orgmode@gnu.org; Fri, 07 Dec 2012 14:55:12 -0500 Received: from plane.gmane.org ([80.91.229.3]:48134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th40o-0001ZT-Ep for emacs-orgmode@gnu.org; Fri, 07 Dec 2012 14:55:06 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Th40v-0005xw-Um for emacs-orgmode@gnu.org; Fri, 07 Dec 2012 20:55:13 +0100 Received: from pd9eb3666.dip.t-dialin.net ([217.235.54.102]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 07 Dec 2012 20:55:13 +0100 Received: from Stromeko by pd9eb3666.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 07 Dec 2012 20:55:13 +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 This has been in there for a while and only been visible due to byte-compiler warnings about free variable result-params. Either the tests don't really exercise this code path well or we've been lucky that result-params was bound to the correct value during all those calls. --8<---------------cut here---------------start------------->8--- commit c92a0f22165ab25fb3e6fc5e130945c624f10c39 (HEAD, refs/heads/lth-mk) Author: Achim Gratz Date: Fri Dec 7 20:48:24 2012 +0100 org-babel: fix bug introduced in commit 78cdf149 * lisp/ob.el (org-babel-result-cond): Macro expansion needs to unquote formal parameter `result-params´. Modified lisp/ob.el diff --git a/lisp/ob.el b/lisp/ob.el index c030a7f..7b2213d 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -2564,14 +2564,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))) --8<---------------cut here---------------end--------------->8--- Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada