From f4e72ffcd467db74fe1f17790e711a3f4c6f7213 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 18 Dec 2021 13:16:16 -0500 Subject: [PATCH 1/2] org-babel-tangle-file: Fix void variable error from last commit * lisp/ob-tangle.el (org-babel-tangle-file): Switch let to let* to fix void variable error. --- lisp/ob-tangle.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 8f57d731e..c80b61334 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -179,8 +179,8 @@ source code blocks by languages matching a regular expression. Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") - (let ((visited (find-buffer-visiting file)) - (buffer (or visited (find-file-noselect file)))) + (let* ((visited (find-buffer-visiting file)) + (buffer (or visited (find-file-noselect file)))) (with-current-buffer buffer (org-with-wide-buffer (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re)))) From a18849b786c1f0081f2942be9c288c62bc59fa42 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 18 Dec 2021 13:16:16 -0500 Subject: [PATCH 2/2] org-babel-tangle-file: Revert recent change in return value * lisp/ob-tangle.el (org-babel-tangle-file): Restore the recently removed prog1 so that the return value matches the documented one. --- lisp/ob-tangle.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index c80b61334..8ed7002ef 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -181,10 +181,12 @@ Return a list whose CAR is the tangled file name." (interactive "fFile to tangle: \nP") (let* ((visited (find-buffer-visiting file)) (buffer (or visited (find-file-noselect file)))) - (with-current-buffer buffer - (org-with-wide-buffer - (mapcar #'expand-file-name (org-babel-tangle nil target-file lang-re)))) - (unless visited (kill-buffer buffer)))) + (prog1 + (with-current-buffer buffer + (org-with-wide-buffer + (mapcar #'expand-file-name + (org-babel-tangle nil target-file lang-re)))) + (unless visited (kill-buffer buffer))))) (defun org-babel-tangle-publish (_ filename pub-dir) "Tangle FILENAME and place the results in PUB-DIR."