diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-08 22:50:52 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-08 22:50:52 +0100 |
| commit | 87234bee559039197d791febcaac2155a7fb4304 (patch) | |
| tree | 6f4a56c0481d39218b94f8a2f9c7c0b98fff95ce | |
| parent | 8285763b973fe038c1970040cfc77473372f8d9f (diff) | |
| parent | ba4852ec74ea8159ac91a0bbc88469e7617b4963 (diff) | |
| download | org-mode-87234bee559039197d791febcaac2155a7fb4304.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-python.el | 2 | ||||
| -rw-r--r-- | lisp/ox-md.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 694e5fc..1457682 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -136,7 +136,7 @@ specifying a variable of the same value." (if (equal var 'hline) org-babel-python-hline-to (format - (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%s\"\"" "%s") + (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") var)))) (defun org-babel-python-table-or-string (results) diff --git a/lisp/ox-md.el b/lisp/ox-md.el index ffb3049..0078ae8 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -255,7 +255,8 @@ a communication channel." (off "[ ] ")) (let ((tag (org-element-property :tag item))) (and tag (format "**%s:** "(org-export-data tag info)))) - (org-trim (replace-regexp-in-string "^" " " contents))))) + (and contents + (org-trim (replace-regexp-in-string "^" " " contents)))))) |