summaryrefslogtreecommitdiff
path: root/lisp/ob-exp.el
diff options
context:
space:
mode:
authorSébastien Delafond <sdelafond@gmail.com>2014-07-13 13:35:34 +0200
committerSébastien Delafond <sdelafond@gmail.com>2014-07-13 13:35:34 +0200
commit77ddd382df838e38504b822e729250b2a6dd9b63 (patch)
tree797a630f5c1131dcbe01d3105f75b38fb03f92a2 /lisp/ob-exp.el
parentefc77ab6f5e8883fc38d8c6f75b6db54a0965c15 (diff)
Imported Upstream version 8.2.6
Diffstat (limited to 'lisp/ob-exp.el')
-rw-r--r--lisp/ob-exp.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index cb64136..6d65496 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -269,7 +269,9 @@ this template."
(save-excursion (goto-char end)
(line-end-position)))
(insert replacement)
- (if (org-element-property :preserve-indent element)
+ (if (or org-src-preserve-indentation
+ (org-element-property :preserve-indent
+ element))
;; Indent only the code block markers.
(save-excursion (skip-chars-backward " \r\t\n")
(indent-line-to ind)