From 9e686bd6813a0ba919c321ac539b57710e056ddb Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Sat, 25 Jun 2011 15:20:05 -0700 Subject: [PATCH] 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. --- lisp/ob.el | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lisp/ob.el b/lisp/ob.el index 1205ed009..537592b3c 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -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 -- 2.11.4.GIT