emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Eric Schulte <schulte.eric@gmail.com>
To: Michael Brand <michael.ch.brand@gmail.com>
Cc: Org-mode Mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] minor patch to org-babel-load-file
Date: Thu, 20 Jun 2013 09:58:01 -0600	[thread overview]
Message-ID: <87txkssrjq.fsf@gmail.com> (raw)
In-Reply-To: <CALn3zoivoi4wLhCeRNydmncV1bYkvnD68EcBrPO+c4MyJrp70g@mail.gmail.com> (Michael Brand's message of "Tue, 18 Jun 2013 10:14:36 +0200")

Michael Brand <michael.ch.brand@gmail.com> writes:

> Hi Levin
>
> On Tue, Jun 18, 2013 at 9:44 AM, Levin Du <zslevin@gmail.com> wrote:
>> Below is the patch that solves this problem.
>
> Recently I also noticed a regression of org-babel-load-file that is
> resolved with your patch. Thank you for saving me of one of my TODOs.
>

This patch doesn't fix the actual cause of this bug.  The problem stems
from commit 693dda67 [1], and I've just pushed up a fix in commit
a79fd4be [2].

Thanks to both of your for raising this issue.

Footnotes: 
[1]  commit 693dda67e60530c9f7b2510f44f6d14595473e28
     Author: Achim Gratz <Stromeko@Stromeko.DE>
     Date:   Fri Jun 7 22:19:38 2013 +0200

         ob-core: allow language specific header arguments in properties

         * lisp/ob-core.el (org-babel-insert-header-arg,
           org-babel-parse-src-block-match): Replace `if' with empty else part
           by `when' for readability.  (org-babel-params-from-properties):
           Inquire for language specific and default header properties.
           Language specific header properties take precedence over default
           header properties and old-style header property specifications.

         This allows for header arguments to be specified as
         properties (including inheritance).

         #+PROPERTY: header-args :cache "no"
         #+PROPERTY: header-args:R :session "*R-property*"

         :PROPERTIES:
         :header-args:   :cache "yes"
         :header-args:R: :session "*R-drawer*"
         :END:

[2]  commit a79fd4be2863a300c88218b40b1adca23d9e1eb8
     Author: Eric Schulte <schulte.eric@gmail.com>
     Date:   Thu Jun 20 09:53:56 2013 -0600

         fix babel merge params bug from commit 693dda67

           The `org-babel-params-from-properties' command was calling
           `org-babel-merge-params', the output of which was then being fed back
           to another call to `org-babel-merge-params'.  The merge params
           function is not designed to allow this form of recursive calling, and
           as a result many variables were being set to empty values.

           The first noticed side effect of this bug was the breakage of the
           org-babel-load-file command, which relies on default header
           arguments (namely :tangle), which were overwritten by the bug above.

           The fix involved having the `org-babel-params-from-properties'
           function return a list of alists, which may then all be handed to the
           top-level merge-params call.

         * lisp/ob-core.el (org-babel-params-from-properties): Now returns a list
           of alists and does *not* call `org-babel-merge-params'.
           (org-babel-parse-src-block-match): Handle new list of lists output of
           `org-babel-params-from-properties'.
           (org-babel-parse-inline-src-block-match): Handle new list of lists
           output of `org-babel-params-from-properties'.
         * lisp/ob-exp.el (org-babel-exp-src-block): Handle new list of lists
           output of `org-babel-params-from-properties'.
           (org-babel-exp-non-block-elements): Handle new list of lists output of
           `org-babel-params-from-properties'.
         * lisp/ob-lob.el (org-babel-lob-execute): Handle new list of lists
           output of `org-babel-params-from-properties'.

-- 
Eric Schulte
http://cs.unm.edu/~eschulte

  reply	other threads:[~2013-06-20 15:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18  7:44 [PATCH] minor patch to org-babel-load-file Levin Du
2013-06-18  8:14 ` Michael Brand
2013-06-20 15:58   ` Eric Schulte [this message]
2013-06-20 16:37     ` Michael Brand
2013-06-20 18:00     ` Achim Gratz

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=87txkssrjq.fsf@gmail.com \
    --to=schulte.eric@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=michael.ch.brand@gmail.com \
    /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).