[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 58c3762: python.el: Fix prompt detection with user
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] master 58c3762: python.el: Fix prompt detection with user overridden interpreter |
Date: |
Sun, 23 Aug 2015 17:00:29 +0000 |
branch: master
commit 58c3762a8b8cfcf714539bda7114f52b6f615258
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>
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.
---
lisp/progmodes/python.el | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3bfc5cf..426b465 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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 58c3762: python.el: Fix prompt detection with user overridden interpreter,
Fabián Ezequiel Gallina <=