aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/cfengine.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/cfengine.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/cfengine.el')
-rw-r--r--lisp/progmodes/cfengine.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 18df372f2c6..f25b3cb9e2b 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1390,12 +1390,15 @@ to the action header."
1390 (when buffer-file-name 1390 (when buffer-file-name
1391 (shell-quote-argument buffer-file-name))))) 1391 (shell-quote-argument buffer-file-name)))))
1392 1392
1393 ;; For emacs < 25.1 where `eldoc-documentation-function' defaults to 1393 (if (boundp 'eldoc-documentation-functions)
1394 ;; nil. 1394 (add-hook 'eldoc-documentation-functions
1395 (or eldoc-documentation-function 1395 #'cfengine3-documentation-function nil t)
1396 (setq-local eldoc-documentation-function #'ignore)) 1396 ;; For emacs < 25.1 where `eldoc-documentation-function' defaults
1397 (add-function :before-until (local 'eldoc-documentation-function) 1397 ;; to nil.
1398 #'cfengine3-documentation-function) 1398 (or eldoc-documentation-function
1399 (setq-local eldoc-documentation-function #'ignore))
1400 (add-function :before-until (local 'eldoc-documentation-function)
1401 #'cfengine3-documentation-function))
1399 1402
1400 (add-hook 'completion-at-point-functions 1403 (add-hook 'completion-at-point-functions
1401 #'cfengine3-completion-function nil t) 1404 #'cfengine3-completion-function nil t)