Merge branch 'maint'

lisp/ob-tangle.el

@@ -442,25 +442,25 @@ non-nil, return the full association list to be used by
 	  (intern (concat "org-babel-variable-assignments:" src-lang)))
 	 (body
 	  ;; Run the tangle-body-hook.
-          (with-temp-buffer
-	    (insert
-	     ;; Expand body in language specific manner.
           (let ((body (if (org-babel-noweb-p params :tangle)
 			  (org-babel-expand-noweb-references info)
 			(nth 1 info))))
+	    (with-temp-buffer
+	      (insert
+	       ;; Expand body in language specific manner.
 	       (cond ((assq :no-expand params) body)
 		     ((fboundp expand-cmd) (funcall expand-cmd body params))
 		     (t
 		      (org-babel-expand-body:generic
 		       body params (and (fboundp assignments-cmd)
-					(funcall assignments-cmd params)))))))
+					(funcall assignments-cmd params))))))
 	      (when (string-match "-r" extra)
 		(goto-char (point-min))
 		(while (re-search-forward
 			(replace-regexp-in-string "%s" ".+" cref-fmt) nil t)
 		  (replace-match "")))
 	      (run-hooks 'org-babel-tangle-body-hook)
-	    (buffer-string)))
+	      (buffer-string))))
 	 (comment
 	  (when (or (string= "both" (cdr (assq :comments params)))
 		    (string= "org" (cdr (assq :comments params))))

testing/lisp/test-ob-tangle.el

@@ -63,11 +63,12 @@
            "df|sed '1d'|awk '{print $5 \" \" $6}'|sort -n |tail -1|awk '{print $2}'"))
       (org-narrow-to-subtree)
       (org-babel-tangle)
+      (should (unwind-protect
 		  (with-temp-buffer
 		    (insert-file-contents "babel.sh")
 		    (goto-char (point-min))
-        (should (re-search-forward (regexp-quote tangled) nil t)))
-      (delete-file "babel.sh"))))
+		    (re-search-forward (regexp-quote tangled) nil t))
+		(when (file-exists-p "babel.sh") (delete-file "babel.sh")))))))
 
 (ert-deftest ob-tangle/expand-headers-as-noweb-references ()
   "Test that references to headers are expanded during noweb expansion."