ob-merge-params: fixed order or precedence for variables

* lisp/ob.el (org-babel-merge-params): fixed order or precedence for
  variables
This commit is contained in:
Eric Schulte 2010-10-15 22:36:01 -06:00 committed by Dan Davison
parent 2ddcf9e255
commit 1aed27c104
1 changed files with 12 additions and 3 deletions

View File

@ -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