diff options
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 36b62bfe96e..165463aef59 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -5553,14 +5553,16 @@ REPORT-FN is Flymake's callback function." | |||
| 5553 | (current-column)))) | 5553 | (current-column)))) |
| 5554 | (^ '(- (1+ (current-indentation)))))) | 5554 | (^ '(- (1+ (current-indentation)))))) |
| 5555 | 5555 | ||
| 5556 | (if (null eldoc-documentation-function) | 5556 | (with-no-warnings |
| 5557 | ;; Emacs<25 | 5557 | ;; supress warnings about eldoc-documentation-function being obsolete |
| 5558 | (set (make-local-variable 'eldoc-documentation-function) | 5558 | (if (null eldoc-documentation-function) |
| 5559 | #'python-eldoc-function) | 5559 | ;; Emacs<25 |
| 5560 | (if (boundp 'eldoc-documentation-functions) | 5560 | (set (make-local-variable 'eldoc-documentation-function) |
| 5561 | (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t) | 5561 | #'python-eldoc-function) |
| 5562 | (add-function :before-until (local 'eldoc-documentation-function) | 5562 | (if (boundp 'eldoc-documentation-functions) |
| 5563 | #'python-eldoc-function))) | 5563 | (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t) |
| 5564 | (add-function :before-until (local 'eldoc-documentation-function) | ||
| 5565 | #'python-eldoc-function)))) | ||
| 5564 | 5566 | ||
| 5565 | (add-to-list | 5567 | (add-to-list |
| 5566 | 'hs-special-modes-alist | 5568 | 'hs-special-modes-alist |