From da03a848e548c97667945c6e0207e8d336fd973c Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Wed, 30 Dec 2009 17:37:03 -0700 Subject: [PATCH] babel: now correctly combining nested tangle header arguments --- contrib/babel/lisp/org-babel.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el index e6dcd28ee..f58c8320b 100644 --- a/contrib/babel/lisp/org-babel.el +++ b/contrib/babel/lisp/org-babel.el @@ -871,9 +871,8 @@ parameters when merging lists." (:exports (setq exports (e-merge exports-exclusive-groups exports (split-string (cdr pair))))) - (:tangle - (setq tangle (e-merge '(("yes" "no")) - tangle (split-string (or (cdr pair) ""))))) + (:tangle ;; take the latest -- always overwrite + (setq tangle (or (list (cdr pair)) tangle))) (:noweb (setq noweb (e-merge '(("yes" "no")) noweb (split-string (or (cdr pair) "")))))