[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111204: * progmodes/python.el (python-shell-parse-command): Find

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 111204
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: emacs-24
timestamp: Mon 2013-01-28 18:59:42 -0300
message:
  * progmodes/python.el (python-shell-parse-command): Find
  python-shell-interpreter with modified environment.
modified:
  lisp/ChangeLog
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-27 00:17:11 +0000
+++ b/lisp/ChangeLog    2013-01-28 21:59:42 +0000
@@ -1,3 +1,8 @@
+2013-01-28  Fabián Ezequiel Gallina  <address@hidden>
+
+       * progmodes/python.el (python-shell-parse-command): Find
+       python-shell-interpreter with modified environment.
+
 2013-01-26  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl.el (cl-set-getf): Add compatibility alias.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2013-01-24 01:24:09 +0000
+++ b/lisp/progmodes/python.el  2013-01-28 21:59:42 +0000
@@ -1654,7 +1654,11 @@
 
 (defun python-shell-parse-command ()
   "Calculate the string used to execute the inferior Python process."
-  (format "%s %s" python-shell-interpreter python-shell-interpreter-args))
+  (let ((process-environment (python-shell-calculate-process-environment))
+        (exec-path (python-shell-calculate-exec-path)))
+    (format "%s %s"
+            (executable-find python-shell-interpreter)
+            python-shell-interpreter-args)))
 
 (defun python-shell-calculate-process-environment ()
   "Calculate process environment given `python-shell-virtualenv-path'."