summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2015-08-23 13:58:17 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2015-08-23 13:59:48 -0300
commit58c3762a8b8cfcf714539bda7114f52b6f615258 (patch)
treeedb76e80ad965d5c3f8b745f61b79aac41065ad7 /lisp
parenta7088b50273287cd62eb222d3f1a4b12bd7dddba (diff)
downloademacs-58c3762a8b8cfcf714539bda7114f52b6f615258.tar.gz
python.el: Fix prompt detection with user overridden interpreter
* lisp/progmodes/python.el (python-shell-prompt-detect): Honor buffer local python-shell-interpreter and python-shell-interpreter-interactive-arg.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3bfc5cf4b6f..426b465f745 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2200,6 +2200,8 @@ detection and just returns nil."
"ps_json = '\\n[\"%s\", \"%s\", \"%s\"]\\n' % tuple(ps)\n"
"print (ps_json)\n"
"sys.exit(0)\n"))
+ (interpreter python-shell-interpreter)
+ (interpreter-arg python-shell-interpreter-interactive-arg)
(output
(with-temp-buffer
;; TODO: improve error handling by using
@@ -2209,11 +2211,11 @@ 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
- python-shell-interpreter
+ interpreter
code-file
'(t nil)
nil
- python-shell-interpreter-interactive-arg)
+ interpreter-arg)
;; Try to cleanup
(delete-file code-file)))
(buffer-string)))