summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-07-17 12:06:55 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-07-17 12:06:55 +0200
commit08d91f37af37b0bf03fe0cab296a0f93d2dc72a7 (patch)
treed8f6648df14b8d70d26f275185037d917f4af5cb
parent63f7f6cd22d9d3d4e5e50490950161ef0f9a8800 (diff)
parent8301b72ed2d6c4a518293b1e8df67705dad75605 (diff)
downloadorg-mode-08d91f37af37b0bf03fe0cab296a0f93d2dc72a7.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-exp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 6150026..9dc3b51 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -30,6 +30,7 @@
(declare-function org-element-context "org-element" (&optional element))
(declare-function org-element-property "org-element" (property element))
(declare-function org-element-type "org-element" (element))
+(declare-function org-escape-code-in-string "org-src" (s))
(declare-function org-export-copy-buffer "ox" ())
(declare-function org-fill-template "org" (template alist))
(declare-function org-get-indentation "org" (&optional line))
@@ -341,7 +342,7 @@ replaced with its value."
org-babel-exp-inline-code-template
org-babel-exp-code-template)
`(("lang" . ,(nth 0 info))
- ("body" . ,(nth 1 info))
+ ("body" . ,(org-escape-code-in-string (nth 1 info)))
("switches" . ,(let ((f (nth 3 info)))
(and (org-string-nw-p f) (concat " " f))))
("flags" . ,(let ((f (assq :flags (nth 2 info))))