diff options
| author | Paul Eggert | 2014-04-22 14:32:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-04-22 14:32:51 -0700 |
| commit | 42e910349d699ee3f8024371ca1e60e015fc6aa7 (patch) | |
| tree | ba589f3f7c278671f0ae9c5c8f15c241ae8dd674 /lisp/org/ob-python.el | |
| parent | 4f96579371290b201a973072a1c2f237755bb954 (diff) | |
| parent | 34e856d5ac828753b7be20e2471f39fb613f7f40 (diff) | |
| download | emacs-42e910349d699ee3f8024371ca1e60e015fc6aa7.tar.gz emacs-42e910349d699ee3f8024371ca1e60e015fc6aa7.zip | |
Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu
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." | |||
| 137 | org-babel-python-hline-to | 137 | org-babel-python-hline-to |
| 138 | (format | 138 | (format |
| 139 | (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") | 139 | (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") |
| 140 | var)))) | 140 | (if (stringp var) (substring-no-properties var) var))))) |
| 141 | 141 | ||
| 142 | (defun org-babel-python-table-or-string (results) | 142 | (defun org-babel-python-table-or-string (results) |
| 143 | "Convert RESULTS into an appropriate elisp value. | 143 | "Convert RESULTS into an appropriate elisp value. |