From 0af2f6068f48f09c4e6feb26e0a72dff869ec7ea Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Oct 2012 09:19:41 +0200 Subject: [PATCH] org-export: Fix comma escape in included files * contrib/lisp/org-export.el (org-export-expand-include-keyword): Use new functions to comma escape contents of included files when in an example or a src block. --- contrib/lisp/org-export.el | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index 62a18a55b..3ef882fe9 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -2774,23 +2774,16 @@ paths." (insert (let ((ind-str (make-string ind ? )) (contents - ;; Protect sensitive contents with commas. - (replace-regexp-in-string - "\\(^\\)\\([*]\\|[ \t]*#\\+\\)" "," - (org-export--prepare-file-contents file lines) - nil nil 1))) + (org-escape-code-in-string + (org-export--prepare-file-contents file lines)))) (format "%s#+BEGIN_EXAMPLE\n%s%s#+END_EXAMPLE\n" ind-str contents ind-str)))) ((stringp env) (insert (let ((ind-str (make-string ind ? )) (contents - ;; Protect sensitive contents with commas. - (replace-regexp-in-string - (if (string= env "org") "\\(^\\)\\(.\\)" - "\\(^\\)\\([*]\\|[ \t]*#\\+\\)") "," - (org-export--prepare-file-contents file lines) - nil nil 1))) + (org-escape-code-in-string + (org-export--prepare-file-contents file lines)))) (format "%s#+BEGIN_SRC %s\n%s%s#+END_SRC\n" ind-str env contents ind-str)))) (t -- 2.11.4.GIT