diff options
| author | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
| commit | 30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa (patch) | |
| tree | 782f2f5767065ad571bf5b82a162da96064cf22a /lisp/org/ob-python.el | |
| parent | d5ff4ded7a225306017006fc96b0a30180ae6f6b (diff) | |
| download | emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.tar.gz | |
Merge Org 8.2.6-1.
The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
Diffstat (limited to 'lisp/org/ob-python.el')
| -rw-r--r-- | lisp/org/ob-python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index 145768272a6..baa5764ac42 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el @@ -137,7 +137,7 @@ specifying a variable of the same value." org-babel-python-hline-to (format (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") - var)))) + (if (stringp var) (substring-no-properties var) var))))) (defun org-babel-python-table-or-string (results) "Convert RESULTS into an appropriate elisp value. |