aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorMark Oteiza2020-02-25 17:53:04 -0500
committerMark Oteiza2020-02-25 18:15:12 -0500
commitc0fcbd2c119b8418855f0931aceefbef717c5e53 (patch)
treee082296f7c739d7e4420ddd7210a0f022174640b /lisp/progmodes/python.el
parent03c07c88d90b5747456b9d286bace2dd4a713aac (diff)
downloademacs-c0fcbd2c119b8418855f0931aceefbef717c5e53.tar.gz
emacs-c0fcbd2c119b8418855f0931aceefbef717c5e53.zip
Expose ElDoc functions in a hook (Bug#28257)
* lisp/emacs-lisp/eldoc.el: Update commentary. (eldoc--eval-expression-setup): Use new hook. (eldoc--supported-p): Accomodate new hook. (eldoc-documentation-functions): New hook. (eldoc-documentation-default, eldoc-documentation-compose): New functions. (eldoc-documentation-function): Use 'eldoc-documentation-default' as new default value. Update documentation and custom attributes. (eldoc-print-current-symbol-info): Accomodate possible null value for 'eldoc-documentation-function'. * etc/NEWS: Mention them. * doc/emacs/programs.texi (Emacs Lisp Documentation Lookup): Mention new hook and changes to 'eldoc-documentation-function'. * lisp/hexl.el (hexl-mode, hexl-revert-buffer-function): * lisp/ielm.el (inferior-emacs-lisp-mode): * lisp/progmodes/cfengine.el (cfengine3-mode): * lisp/progmodes/elisp-mode.el (emacs-lisp-mode): * lisp/progmodes/octave.el (octave-mode): * lisp/progmodes/python.el (python-mode): Use new hook.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a2d85d0bef8..67383b34154 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5544,8 +5544,10 @@ REPORT-FN is Flymake's callback function."
5544 ;; Emacs<25 5544 ;; Emacs<25
5545 (set (make-local-variable 'eldoc-documentation-function) 5545 (set (make-local-variable 'eldoc-documentation-function)
5546 #'python-eldoc-function) 5546 #'python-eldoc-function)
5547 (add-function :before-until (local 'eldoc-documentation-function) 5547 (if (boundp 'eldoc-documentation-functions)
5548 #'python-eldoc-function)) 5548 (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t)
5549 (add-function :before-until (local 'eldoc-documentation-function)
5550 #'python-eldoc-function)))
5549 5551
5550 (add-to-list 5552 (add-to-list
5551 'hs-special-modes-alist 5553 'hs-special-modes-alist