mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-05-30 15:19:03 +02:00
parent 6a788618e3 8b431a8021
commit 4b0f0fdecf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ob-exp.el
View File

@ -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)