From 2fda33bfef319654b46879056ff56a64259920e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Oct 2018 00:01:50 +0200 Subject: [PATCH] ob-tangle: Fix tangling order * lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Preserver order of code blocks from the source document. * testing/lisp/test-ob-tangle.el (ob-tangle/block-order): New test. Reported-by: Kaushal Modi --- lisp/ob-tangle.el | 3 ++- testing/lisp/test-ob-tangle.el | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index d78c90b96..57798f86e 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -407,7 +407,8 @@ can be used to limit the collected code blocks by target file." (if by-lang (setcdr by-lang (cons block (cdr by-lang))) (push (cons src-lang (list block)) blocks))))))) ;; Ensure blocks are in the correct order. - (mapcar (lambda (b) (cons (car b) (nreverse (cdr b)))) blocks))) + (mapcar (lambda (b) (cons (car b) (nreverse (cdr b)))) + (nreverse blocks)))) (defun org-babel-tangle-single-block (block-counter &optional only-this-block) "Collect the tangled source for current block. diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el index 560cc6c56..1dfd1a973 100644 --- a/testing/lisp/test-ob-tangle.el +++ b/testing/lisp/test-ob-tangle.el @@ -222,6 +222,51 @@ another block (buffer-string))) (delete-file "test-ob-tangle.org")))))) +(ert-deftest ob-tangle/block-order () + "Test order of tangled blocks." + ;; Order per language. + (should + (equal '("1" "2") + (let ((file (make-temp-file "org-tangle-"))) + (unwind-protect + (progn + (org-test-with-temp-text-in-file + (format "#+property: header-args :tangle %S +#+begin_src emacs-lisp +1 +#+end_src + +#+begin_src emacs-lisp +2 +#+end_src" + file) + (org-babel-tangle)) + (with-temp-buffer + (insert-file-contents file) + (org-split-string (buffer-string)))) + (delete-file file))))) + ;; Order per source block. + (should + (equal '("1" "2") + (let ((file (make-temp-file "org-tangle-"))) + (unwind-protect + (progn + (org-test-with-temp-text-in-file + (format "#+property: header-args :tangle %S +#+begin_src foo +1 +#+end_src + +#+begin_src bar +2 +#+end_src" + file) + (org-babel-tangle)) + (with-temp-buffer + (insert-file-contents file) + (org-split-string (buffer-string)))) + (delete-file file)))))) + (provide 'test-ob-tangle) ;;; test-ob-tangle.el ends here