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.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ec5d8c55512..ae5aff351c0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4415,7 +4415,7 @@ returns will be used. If not FORCE-PROCESS is passed what
4415 4415
4416(defvar-local python-eldoc-get-doc t 4416(defvar-local python-eldoc-get-doc t
4417 "Non-nil means eldoc should fetch the documentation 4417 "Non-nil means eldoc should fetch the documentation
4418 automatically. Set to nil by `python-eldoc-function' if 4418 automatically. Set to nil by `python-eldoc-function' if
4419 `python-eldoc-function-timeout-permanent' is non-nil and 4419 `python-eldoc-function-timeout-permanent' is non-nil and
4420 `python-eldoc-function' times out.") 4420 `python-eldoc-function' times out.")
4421 4421
@@ -4427,7 +4427,7 @@ returns will be used. If not FORCE-PROCESS is passed what
4427 4427
4428(defcustom python-eldoc-function-timeout-permanent t 4428(defcustom python-eldoc-function-timeout-permanent t
4429 "Non-nil means that when `python-eldoc-function' times out 4429 "Non-nil means that when `python-eldoc-function' times out
4430`python-eldoc-get-doc' will be set to nil" 4430`python-eldoc-get-doc' will be set to nil."
4431 :group 'python 4431 :group 'python
4432 :type 'boolean 4432 :type 'boolean
4433 :version "25.1") 4433 :version "25.1")
@@ -4445,7 +4445,7 @@ function returns then if
4445longer return the documentation at the point automatically. 4445longer return the documentation at the point automatically.
4446 4446
4447Set `python-eldoc-get-doc' to t to reenable eldoc documentation 4447Set `python-eldoc-get-doc' to t to reenable eldoc documentation
4448fetching" 4448fetching."
4449 (when python-eldoc-get-doc 4449 (when python-eldoc-get-doc
4450 (with-timeout (python-eldoc-function-timeout 4450 (with-timeout (python-eldoc-function-timeout
4451 (if python-eldoc-function-timeout-permanent 4451 (if python-eldoc-function-timeout-permanent