ob: ensure that un-named variables are assigned correctly

* lisp/ob.el (org-babel-merge-params): Do not reverse variable order,
  and be sure to increment variable index as appropriate.
This commit is contained in:
Eric Schulte 2011-06-25 15:20:05 -07:00
parent 90512366cd
commit 9e686bd681
1 changed files with 14 additions and 10 deletions

View File

@ -1750,17 +1750,21 @@ parameters when merging lists."
(intern (match-string 1 (cdr pair)))))))
(if name
(setq vars
(cons (cons name pair)
(if (member name (mapcar #'car vars))
(delq nil
(mapcar
(lambda (p) (unless (equal (car p) name) p))
vars))
vars)))
(append
(if (member name (mapcar #'car vars))
(delq nil
(mapcar
(lambda (p)
(unless (equal (car p) name) p))
vars))
vars)
(list (cons name pair))))
;; if no name is given, then assign to variables in order
(setf (cddr (nth variable-index vars))
(concat (symbol-name (car (nth variable-index vars)))
"=" (cdr pair))))))
(prog1 (setf (cddr (nth variable-index vars))
(concat (symbol-name
(car (nth variable-index vars)))
"=" (cdr pair)))
(incf variable-index)))))
(:results
(setq results (e-merge results-exclusive-groups
results