diff options
| author | Glenn Morris | 2013-01-30 00:07:37 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-30 00:07:37 -0800 |
| commit | 3f82a88a05e227145b0470991050698085d19fbe (patch) | |
| tree | 38b8e6b4a86c251ba02264aa01325219aaf16e4b /lisp/progmodes/python.el | |
| parent | 9e4ce6976d594b65c7b925fdff12a1adadb3b688 (diff) | |
| parent | fe93f41aa0f701315884bf0f8d2cbc6a9f914209 (diff) | |
| download | emacs-3f82a88a05e227145b0470991050698085d19fbe.tar.gz emacs-3f82a88a05e227145b0470991050698085d19fbe.zip | |
Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2f353feb323..a1322239b35 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1664,7 +1664,11 @@ uniqueness for different types of configurations." | |||
| 1664 | 1664 | ||
| 1665 | (defun python-shell-parse-command () | 1665 | (defun python-shell-parse-command () |
| 1666 | "Calculate the string used to execute the inferior Python process." | 1666 | "Calculate the string used to execute the inferior Python process." |
| 1667 | (format "%s %s" python-shell-interpreter python-shell-interpreter-args)) | 1667 | (let ((process-environment (python-shell-calculate-process-environment)) |
| 1668 | (exec-path (python-shell-calculate-exec-path))) | ||
| 1669 | (format "%s %s" | ||
| 1670 | (executable-find python-shell-interpreter) | ||
| 1671 | python-shell-interpreter-args))) | ||
| 1668 | 1672 | ||
| 1669 | (defun python-shell-calculate-process-environment () | 1673 | (defun python-shell-calculate-process-environment () |
| 1670 | "Calculate process environment given `python-shell-virtualenv-path'." | 1674 | "Calculate process environment given `python-shell-virtualenv-path'." |