ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Nicolas Goaziou 2012-10-06 09:19:41 +02:00
parent 2c78ca4a56
commit 0af2f6068f
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/lisp/org-export.el
View File

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