; Revert "Use eldoc-documentation-functions"

This reverts commit 001d88b62ecb8163a148656acb103b354ce7613a.

It doesn't have the consensus, as evidenced by
http://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00138.html

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."
                                                  (current-column))))
          (^ '(- (1+ (current-indentation))))))
 
-  (if (boundp 'eldoc-documentation-functions)
-      (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t)
-    (if (null eldoc-documentation-function)
-        ;; Emacs<25
-        (set (make-local-variable 'eldoc-documentation-function)
-             #'python-eldoc-function)
-      (add-function :before-until (local 'eldoc-documentation-function)
-                    #'python-eldoc-function)))
+  (if (null eldoc-documentation-function)
+      ;; Emacs<25
+      (set (make-local-variable 'eldoc-documentation-function)
+           #'python-eldoc-function)
+    (add-function :before-until (local 'eldoc-documentation-function)
+                  #'python-eldoc-function))
 
   (add-to-list
    'hs-special-modes-alist