From 99a8d97ffa000b391969806d655ac0f7aef193b2 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Mon, 29 Jul 2013 07:58:03 -0600 Subject: [PATCH] don't modify missing header arguments during merge * lisp/ob-core.el (org-babel-merge-params): More careful to check that the colname- and rowname-names header arguments exist during merge. --- lisp/ob-core.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index c2722dba2..cc25357a2 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2357,12 +2357,13 @@ parameters when merging lists." (lambda (name) (mapc (lambda (param) - (setf (cdr (assoc param params)) - (remove-if (lambda (pair) (equal (car pair) name)) - (cdr (assoc param params)))) - (setf params (remove-if (lambda (pair) (and (equal (car pair) param) - (null (cdr pair)))) - params))) + (when (assoc param params) + (setf (cdr (assoc param params)) + (remove-if (lambda (pair) (equal (car pair) name)) + (cdr (assoc param params)))) + (setf params (remove-if (lambda (pair) (and (equal (car pair) param) + (null (cdr pair)))) + params)))) (list :colname-names :rowname-names))) clearnames) (mapc -- 2.11.4.GIT