summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-23 14:00:03 +0100
committerBastien Guerry <bzg@altern.org>2013-01-23 14:00:03 +0100
commit1e2b26b62a61c43717188b5089ddfbe8369885c6 (patch)
tree94c6f61efde635c34a07c8536ba76a22134b3aca
parent9d5b79104b3be383d3fb9e685209ece2f619e8c5 (diff)
parent4a0afac6697f3c3374b343484f36d3186724c19f (diff)
downloadorg-mode-1e2b26b62a61c43717188b5089ddfbe8369885c6.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-python.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 6aa2243..02d762c 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -41,7 +41,7 @@
(defvar org-babel-default-header-args:python '())
(defvar org-babel-python-command "python"
- "Name of command for executing Python code.")
+ "Name of the command for executing Python code.")
(defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python)
"Preferred python mode for use in running python interactively.
@@ -156,7 +156,9 @@ then create. Return the initialized session."
(cond
((and (eq 'python org-babel-python-mode)
(fboundp 'run-python)) ; python.el
- (run-python))
+ (if (version< "24.1" emacs-version)
+ (run-python org-babel-python-command)
+ (run-python)))
((and (eq 'python-mode org-babel-python-mode)
(fboundp 'py-shell)) ; python-mode.el
;; Make sure that py-which-bufname is initialized, as otherwise