aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el7
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
1999here. Normally you wont use this variable directly unless you 2000here. Normally you wont use this variable directly unless you
2000plan to ensure a particular set of paths to all Python shell 2001plan to ensure a particular set of paths to all Python shell
2001executed through tramp connections." 2002executed 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
2621interactive actions can be performed. This is useful to safely 2623interactive actions can be performed. This is useful to safely
2622attach setup code for long-running processes that eventually 2624attach setup code for long-running processes that eventually
2623provide a shell." 2625provide 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.
3260When a match is found, native completion is disabled." 3263When 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