summaryrefslogtreecommitdiff
path: root/lisp/org/ob-python.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-04-22 14:32:51 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-04-22 14:32:51 -0700
commit42e910349d699ee3f8024371ca1e60e015fc6aa7 (patch)
treeba589f3f7c278671f0ae9c5c8f15c241ae8dd674 /lisp/org/ob-python.el
parent4f96579371290b201a973072a1c2f237755bb954 (diff)
parent34e856d5ac828753b7be20e2471f39fb613f7f40 (diff)
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.el2
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.