Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-08 18:32:00 +01:00
commit 248bc714b5

View file

@ -136,7 +136,7 @@ specifying a variable of the same value."
(if (equal var 'hline) (if (equal var 'hline)
org-babel-python-hline-to org-babel-python-hline-to
(format (format
(if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%s\"\"" "%s") (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S")
var)))) var))))
(defun org-babel-python-table-or-string (results) (defun org-babel-python-table-or-string (results)