summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-23 12:58:20 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-23 12:58:20 (GMT)
commit4a0afac6697f3c3374b343484f36d3186724c19f (patch)
tree89ec60148ea64417616d8a2de07947b7991b0901
parent340f51f723e671954952e4692f2e70c7e50cc93e (diff)
downloadorg-mode-4a0afac6697f3c3374b343484f36d3186724c19f.zip
org-mode-4a0afac6697f3c3374b343484f36d3186724c19f.tar.gz
ob-python.el: Fix compatibility bug.
* ob-python.el (org-babel-python-command): Fix docstring. (org-babel-python-initiate-session-by-key): Fix bug: `run-python' from Emacs >24.1 requires a python command as an argument. Thanks to Myles English for raising this issue.
-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 55dd1c7..79cc53e 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -44,7 +44,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.
@@ -143,7 +143,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