diff options
| author | Paul Eggert | 2017-03-19 12:24:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 12:24:51 -0700 |
| commit | 468259c26e79113b6208324305ffc22ad74a041e (patch) | |
| tree | 926ec10d0fd0da8ece39fe8899751839d983aceb /lisp/progmodes/python.el | |
| parent | bb9924128397d072c6997de1f0b77ee8ae671e0e (diff) | |
| parent | 0e35405a92be502ab3851890fc4eb660842fd3a9 (diff) | |
| download | emacs-468259c26e79113b6208324305ffc22ad74a041e.tar.gz emacs-468259c26e79113b6208324305ffc22ad74a041e.zip | |
Merge from origin/emacs-25
0e35405 Improve documentation of coding-systems
c2fd04c Improve definition of 'variable-pitch' face on MS-Windows
16fb50d Fix an error message in python.el
a2a2073 Clarify major mode switching
fc38671 Add helpful comment to compile-command's docstring
ee65d85 Fix ':version' of 'select-enable-primary'
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 90b5e4e0dc6..d4ed1392703 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2850,8 +2850,7 @@ of `error' with a user-friendly message." | |||
| 2850 | (or (python-shell-get-process) | 2850 | (or (python-shell-get-process) |
| 2851 | (if interactivep | 2851 | (if interactivep |
| 2852 | (user-error | 2852 | (user-error |
| 2853 | "Start a Python process first with `%s' or `%s'." | 2853 | "Start a Python process first with `M-x run-python' or `%s'." |
| 2854 | (substitute-command-keys "\\[run-python]") | ||
| 2855 | ;; Get the binding. | 2854 | ;; Get the binding. |
| 2856 | (key-description | 2855 | (key-description |
| 2857 | (where-is-internal | 2856 | (where-is-internal |