procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org

Browse source
This commit is contained in:
Glenn Morris 2014-08-27 18:59:29 -07:00
commit 6d26235315
21 changed files with 207 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/progmodes/python.el
View file

@ -1905,7 +1905,7 @@ detection and just returns nil."
(let ((code-file (python-shell--save-temp-file code)))
;; Use `process-file' as it is remote-host friendly.
(process-file
(executable-find python-shell-interpreter)
python-shell-interpreter
code-file
'(t nil)
nil
@ -2061,11 +2061,14 @@ uniqueness for different types of configurations."
(or python-shell-virtualenv-path "")
(mapconcat #'identity python-shell-exec-path "")))))
(defun python-shell-parse-command ()
(defun python-shell-parse-command () ;FIXME: why name it "parse"?
"Calculate the string used to execute the inferior Python process."
;; FIXME: process-environment doesn't seem to be used anywhere within
;; this let.
(let ((process-environment (python-shell-calculate-process-environment))
(exec-path (python-shell-calculate-exec-path)))
(format "%s %s"
;; FIXME: Why executable-find?
(executable-find python-shell-interpreter)
python-shell-interpreter-args)))
@ -2101,11 +2104,10 @@ uniqueness for different types of configurations."
(defun python-shell-calculate-exec-path ()
"Calculate exec path given `python-shell-virtualenv-path'."
(let ((path (append python-shell-exec-path
exec-path nil)))
exec-path nil))) ;FIXME: Why nil?
(if (not python-shell-virtualenv-path)
path
(cons (format "%s/bin"
(directory-file-name python-shell-virtualenv-path))
(cons (expand-file-name "bin" python-shell-virtualenv-path)
path))))
(defvar python-shell--package-depth 10)