From 1aed27c1049d0c36ff18dfde85ad1fc706e4aef1 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Fri, 15 Oct 2010 22:36:01 -0600 Subject: [PATCH] ob-merge-params: fixed order or precedence for variables * lisp/ob.el (org-babel-merge-params): fixed order or precedence for variables --- lisp/ob.el | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ob.el b/lisp/ob.el index 86d267133..c8bdf1e85 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -1552,9 +1552,18 @@ parameters when merging lists." "^\\([^= \f\t\n\r\v]+\\)[ \t]*=" (cdr pair)) (intern (match-string 1 (cdr pair))))))) - (when (and name - (not (member name (mapcar #'car vars)))) - (setq vars (cons (cons name (cdr pair)) vars))))) + (when name + (setq vars + (cons + pair + (if (member name (mapcar #'car vars)) + (delq nil + (mapcar + (lambda (p) + (unless (equal (car p) name) + p)) + vars)) + vars)))))) (:results (setq results (e-merge results-exclusive-groups -- 2.11.4.GIT