diff options
| author | John Wiegley | 2016-01-18 22:56:33 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-18 22:56:33 -0800 |
| commit | 6acd2aa02c6f0eb9d3fadce0bb48183837beafd8 (patch) | |
| tree | d236a14dc554951c3e7c5a5b38a3bd98edc1315a /lisp/progmodes/python.el | |
| parent | 564c84f4b12482aefe86539d2471607565c3ee7c (diff) | |
| parent | 549a765efeca2748e68a5c6ce6c9238784e82535 (diff) | |
| download | emacs-6acd2aa02c6f0eb9d3fadce0bb48183837beafd8.tar.gz emacs-6acd2aa02c6f0eb9d3fadce0bb48183837beafd8.zip | |
-
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3bcbf07cbbd..a8c65fa23a9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -715,6 +715,7 @@ It makes underscores and dots word constituent chars.") | |||
| 715 | 715 | ||
| 716 | (defcustom python-indent-guess-indent-offset-verbose t | 716 | (defcustom python-indent-guess-indent-offset-verbose t |
| 717 | "Non-nil means to emit a warning when indentation guessing fails." | 717 | "Non-nil means to emit a warning when indentation guessing fails." |
| 718 | :version "25.1" | ||
| 718 | :type 'boolean | 719 | :type 'boolean |
| 719 | :group 'python | 720 | :group 'python |
| 720 | :safe' booleanp) | 721 | :safe' booleanp) |
| @@ -1999,6 +2000,7 @@ hosts PATH before starting processes. Values defined in | |||
| 1999 | here. Normally you wont use this variable directly unless you | 2000 | here. Normally you wont use this variable directly unless you |
| 2000 | plan to ensure a particular set of paths to all Python shell | 2001 | plan to ensure a particular set of paths to all Python shell |
| 2001 | executed through tramp connections." | 2002 | executed through tramp connections." |
| 2003 | :version "25.1" | ||
| 2002 | :type '(repeat string) | 2004 | :type '(repeat string) |
| 2003 | :group 'python) | 2005 | :group 'python) |
| 2004 | 2006 | ||
| @@ -2621,6 +2623,7 @@ current process to not hang waiting for output by safeguarding | |||
| 2621 | interactive actions can be performed. This is useful to safely | 2623 | interactive actions can be performed. This is useful to safely |
| 2622 | attach setup code for long-running processes that eventually | 2624 | attach setup code for long-running processes that eventually |
| 2623 | provide a shell." | 2625 | provide a shell." |
| 2626 | :version "25.1" | ||
| 2624 | :type 'hook | 2627 | :type 'hook |
| 2625 | :group 'python) | 2628 | :group 'python) |
| 2626 | 2629 | ||
| @@ -3258,18 +3261,22 @@ the full statement in the case of imports." | |||
| 3258 | (list "pypy") | 3261 | (list "pypy") |
| 3259 | "List of disabled interpreters. | 3262 | "List of disabled interpreters. |
| 3260 | When a match is found, native completion is disabled." | 3263 | When a match is found, native completion is disabled." |
| 3264 | :version "25.1" | ||
| 3261 | :type '(repeat string)) | 3265 | :type '(repeat string)) |
| 3262 | 3266 | ||
| 3263 | (defcustom python-shell-completion-native-enable t | 3267 | (defcustom python-shell-completion-native-enable t |
| 3264 | "Enable readline based native completion." | 3268 | "Enable readline based native completion." |
| 3269 | :version "25.1" | ||
| 3265 | :type 'boolean) | 3270 | :type 'boolean) |
| 3266 | 3271 | ||
| 3267 | (defcustom python-shell-completion-native-output-timeout 5.0 | 3272 | (defcustom python-shell-completion-native-output-timeout 5.0 |
| 3268 | "Time in seconds to wait for completion output before giving up." | 3273 | "Time in seconds to wait for completion output before giving up." |
| 3274 | :version "25.1" | ||
| 3269 | :type 'float) | 3275 | :type 'float) |
| 3270 | 3276 | ||
| 3271 | (defcustom python-shell-completion-native-try-output-timeout 1.0 | 3277 | (defcustom python-shell-completion-native-try-output-timeout 1.0 |
| 3272 | "Time in seconds to wait for *trying* native completion output." | 3278 | "Time in seconds to wait for *trying* native completion output." |
| 3279 | :version "25.1" | ||
| 3273 | :type 'float) | 3280 | :type 'float) |
| 3274 | 3281 | ||
| 3275 | (defvar python-shell-completion-native-redirect-buffer | 3282 | (defvar python-shell-completion-native-redirect-buffer |