diff options
| author | Jan D | 2015-05-23 12:28:54 +0200 |
|---|---|---|
| committer | Jan D | 2015-05-23 12:28:54 +0200 |
| commit | 6aaa489dc112f51f6045f79b37cb78dd513e398f (patch) | |
| tree | a34eb6ad435ab877848f7464374570549ca55ec5 /lisp/progmodes/python.el | |
| parent | ee14727ce033bae3bc11af35e7843604e5a5e635 (diff) | |
| parent | 7ac84a2570e1268cc040fcd529508307b2b22c01 (diff) | |
| download | emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.tar.gz emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4b0a028faa3..d45d082c40a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3216,7 +3216,7 @@ With argument MSG show activation/deactivation message." | |||
| 3216 | (concat | 3216 | (concat |
| 3217 | "Your `python-shell-interpreter' doesn't seem to " | 3217 | "Your `python-shell-interpreter' doesn't seem to " |
| 3218 | "support readline, yet `python-shell-completion-native' " | 3218 | "support readline, yet `python-shell-completion-native' " |
| 3219 | (format "was `t' and %S is not part of the " | 3219 | (format "was t and %S is not part of the " |
| 3220 | (file-name-nondirectory python-shell-interpreter)) | 3220 | (file-name-nondirectory python-shell-interpreter)) |
| 3221 | "`python-shell-completion-native-disabled-interpreters' " | 3221 | "`python-shell-completion-native-disabled-interpreters' " |
| 3222 | "list. Native completions have been disabled locally. ")) | 3222 | "list. Native completions have been disabled locally. ")) |