diff options
| author | Michael Albinus | 2017-12-09 10:13:02 +0100 |
|---|---|---|
| committer | Michael Albinus | 2017-12-09 10:13:02 +0100 |
| commit | 836168a65b63fa32f60bbf211e4238bde49e1f01 (patch) | |
| tree | 20e7f8763132d64c3ceb55408706e3fdb2c15188 /lisp/progmodes/python.el | |
| parent | 7367ea4fc78fd11683eb0b57b0337c575a6accc2 (diff) | |
| parent | 1fdac2d65c7134a2e1261bf7ad32d275f37da0dc (diff) | |
| download | emacs-836168a65b63fa32f60bbf211e4238bde49e1f01.tar.gz emacs-836168a65b63fa32f60bbf211e4238bde49e1f01.zip | |
Merge from origin/emacs-26
1fdac2d65c Don't add newlines in minibuffer history
de68f337e3 modhelp.py: Support Python 3 (Bug#24954)
afb04f7f3c Use forward slashes for python w32 config example (Bug#21656)
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 9e09bfc5941..9d3e428e23c 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -91,9 +91,9 @@ | |||
| 91 | ;; is as follows (of course you need to modify the paths according to | 91 | ;; is as follows (of course you need to modify the paths according to |
| 92 | ;; your system): | 92 | ;; your system): |
| 93 | 93 | ||
| 94 | ;; (setq python-shell-interpreter "C:\\Python27\\python.exe" | 94 | ;; (setq python-shell-interpreter "C:/Python27/python.exe" |
| 95 | ;; python-shell-interpreter-args | 95 | ;; python-shell-interpreter-args |
| 96 | ;; "-i C:\\Python27\\Scripts\\ipython-script.py") | 96 | ;; "-i C:/Python27/Scripts/ipython-script.py") |
| 97 | 97 | ||
| 98 | ;; Missing or delayed output used to happen due to differences between | 98 | ;; Missing or delayed output used to happen due to differences between |
| 99 | ;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7. | 99 | ;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7. |