Merge branch 'maint'

lisp/ob-exp.el

@@ -267,10 +267,7 @@ this template."
 		    (cons
 		     (org-element-property :language element)
 		     (let ((params (org-element-property :parameters element)))
-		       (and params (org-split-string params "[ \t]+")))))
-                   (preserve-indent
-		    (or org-src-preserve-indentation
-			(org-element-property :preserve-indent element))))
+		       (and params (org-split-string params "[ \t]+"))))))
               ;; Execute all non-block elements between POS and
               ;; current block.
               (org-babel-exp-non-block-elements pos begin)
@@ -291,7 +288,7 @@ this template."
 		       (goto-char match-start)
 		       (delete-region (point) block-end)
 		       (insert replacement)
-		       (if preserve-indent
+		       (if (org-element-property :preserve-indent element)
 			   ;; Indent only the code block markers.
 			   (save-excursion (skip-chars-backward " \r\t\n")
 					   (indent-line-to ind)