diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 15:19:03 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 15:19:03 +0200 |
| commit | 4b0f0fdecf033743a63c982e9725dfaaa2351a70 (patch) | |
| tree | 0ae4b6f99161801a44cfec26bbbe8101d11ff180 | |
| parent | 6a788618e30fef787b439760065c122dfa8aad3f (diff) | |
| parent | 8b431a802125735f806318d2174d56065309ac31 (diff) | |
| download | org-mode-4b0f0fdecf033743a63c982e9725dfaaa2351a70.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-exp.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index ef8264d..89fd5d1 100644 --- a/lisp/ob-exp.el +++ b/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) |