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.el14
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ba3cdfe17cd..ad69f8779e0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5153,14 +5153,12 @@ returned as is."
5153 (current-column)))) 5153 (current-column))))
5154 (^ '(- (1+ (current-indentation)))))) 5154 (^ '(- (1+ (current-indentation))))))
5155 5155
5156 (if (boundp 'eldoc-documentation-functions) 5156 (if (null eldoc-documentation-function)
5157 (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t) 5157 ;; Emacs<25
5158 (if (null eldoc-documentation-function) 5158 (set (make-local-variable 'eldoc-documentation-function)
5159 ;; Emacs<25 5159 #'python-eldoc-function)
5160 (set (make-local-variable 'eldoc-documentation-function) 5160 (add-function :before-until (local 'eldoc-documentation-function)
5161 #'python-eldoc-function) 5161 #'python-eldoc-function))
5162 (add-function :before-until (local 'eldoc-documentation-function)
5163 #'python-eldoc-function)))
5164 5162
5165 (add-to-list 5163 (add-to-list
5166 'hs-special-modes-alist 5164 'hs-special-modes-alist