diff options
| author | Bastien Guerry | 2013-02-07 08:11:59 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2013-02-07 08:11:59 +0100 |
| commit | d351707783bbc9b42168d14f566dd63a8ecd9a1c (patch) | |
| tree | 905c5ce57b8f5e2c2baa3112e3017f3ce58b8b58 /lisp/org/ob-python.el | |
| parent | e364bc673cfb92194c7d4a034e3c65ea9137d7ff (diff) | |
| download | emacs-d351707783bbc9b42168d14f566dd63a8ecd9a1c.tar.gz emacs-d351707783bbc9b42168d14f566dd63a8ecd9a1c.zip | |
Merge Org 7.9.3e (commit b07a9bb).
Diffstat (limited to 'lisp/org/ob-python.el')
| -rw-r--r-- | lisp/org/ob-python.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index 55dd1c7cdab..79cc53ea0fa 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | (defvar org-babel-default-header-args:python '()) | 44 | (defvar org-babel-default-header-args:python '()) |
| 45 | 45 | ||
| 46 | (defvar org-babel-python-command "python" | 46 | (defvar org-babel-python-command "python" |
| 47 | "Name of command for executing Python code.") | 47 | "Name of the command for executing Python code.") |
| 48 | 48 | ||
| 49 | (defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python) | 49 | (defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python) |
| 50 | "Preferred python mode for use in running python interactively. | 50 | "Preferred python mode for use in running python interactively. |
| @@ -143,7 +143,9 @@ then create. Return the initialized session." | |||
| 143 | (cond | 143 | (cond |
| 144 | ((and (eq 'python org-babel-python-mode) | 144 | ((and (eq 'python org-babel-python-mode) |
| 145 | (fboundp 'run-python)) ; python.el | 145 | (fboundp 'run-python)) ; python.el |
| 146 | (run-python)) | 146 | (if (version< "24.1" emacs-version) |
| 147 | (run-python org-babel-python-command) | ||
| 148 | (run-python))) | ||
| 147 | ((and (eq 'python-mode org-babel-python-mode) | 149 | ((and (eq 'python-mode org-babel-python-mode) |
| 148 | (fboundp 'py-shell)) ; python-mode.el | 150 | (fboundp 'py-shell)) ; python-mode.el |
| 149 | ;; Make sure that py-which-bufname is initialized, as otherwise | 151 | ;; Make sure that py-which-bufname is initialized, as otherwise |