emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: [PATCH] lisp/ob.el (org-babel-result-cond)
Date: Fri, 07 Dec 2012 20:54:50 +0100	[thread overview]
Message-ID: <877gotiqnp.fsf@Rainer.invalid> (raw)


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 <Stromeko@Stromeko.DE>
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

             reply	other threads:[~2012-12-07 19:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-07 19:54 Achim Gratz [this message]
2012-12-11 14:41 ` [PATCH] lisp/ob.el (org-babel-result-cond) Eric Schulte
2012-12-11 18:21   ` Achim Gratz
2012-12-12  0:26     ` Eric Schulte

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877gotiqnp.fsf@Rainer.invalid \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).