Prechádzať zdrojové kódy

babel: now correctly combining nested tangle header arguments

Eric Schulte 15 rokov pred
rodič
commit
da03a848e5
1 zmenil súbory, kde vykonal 2 pridanie a 3 odobranie
  1. 2 3
      contrib/babel/lisp/org-babel.el

+ 2 - 3
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) "")))))