aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org/ob-python.el
diff options
context:
space:
mode:
authorBastien Guerry2013-12-06 12:21:31 +0100
committerBastien Guerry2013-12-06 12:21:31 +0100
commit73d3db828e8149847b3666acbc38f94898ac15a9 (patch)
tree7cd2d596b9cd5c2c54aef94c4cdf900e99009401 /lisp/org/ob-python.el
parent64ed4306fc76b2b5386deef8cdd101a2dfe13b74 (diff)
downloademacs-73d3db828e8149847b3666acbc38f94898ac15a9.tar.gz
emacs-73d3db828e8149847b3666acbc38f94898ac15a9.zip
Merge Org 8.2.4
Diffstat (limited to 'lisp/org/ob-python.el')
-rw-r--r--lisp/org/ob-python.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 99c35ce2863..3c3f6646877 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -54,7 +54,7 @@ This will typically be either 'python or 'python-mode."
54 :group 'org-babel 54 :group 'org-babel
55 :version "24.4" 55 :version "24.4"
56 :package-version '(Org . "8.0") 56 :package-version '(Org . "8.0")
57 :type 'function) 57 :type 'symbol)
58 58
59(defvar org-src-preserve-indentation) 59(defvar org-src-preserve-indentation)
60 60
@@ -70,7 +70,7 @@ This will typically be either 'python or 'python-mode."
70 :group 'org-babel 70 :group 'org-babel
71 :version "24.4" 71 :version "24.4"
72 :package-version '(Org . "8.0") 72 :package-version '(Org . "8.0")
73 :type 'string) 73 :type 'symbol)
74 74
75(defun org-babel-execute:python (body params) 75(defun org-babel-execute:python (body params)
76 "Execute a block of Python code with Babel. 76 "Execute a block of Python code with Babel.