emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] org-eldoc: Use eldoc-documentation-functions when available
@ 2020-03-04  7:24 Štěpán Němec
  2020-03-05  3:49 ` Kyle Meyer
  0 siblings, 1 reply; 2+ messages in thread
From: Štěpán Němec @ 2020-03-04  7:24 UTC (permalink / raw)
  To: emacs-orgmode

This reflects recent changes in GNU Emacs master branch:

2020-02-25T17:53:04-05:00!mvoteiza@udel.edu
c0fcbd2c11 (Expose ElDoc functions in a hook (Bug#28257))

* lisp/org-eldoc.el (org-eldoc-load):
Use 'eldoc-documentation-functions' when available.
---
 contrib/lisp/org-eldoc.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index b4fc0c866..72b10a1fb 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/lisp/org-eldoc.el
@@ -161,7 +161,11 @@ (defun org-eldoc-documentation-function ()
 (defun org-eldoc-load ()
   "Set up org-eldoc documentation function."
   (interactive)
-  (setq-local eldoc-documentation-function #'org-eldoc-documentation-function))
+  (if (boundp 'eldoc-documentation-functions)
+      (add-hook 'eldoc-documentation-functions
+		#'org-eldoc-documentation-function nil t)
+    (setq-local eldoc-documentation-function
+		#'org-eldoc-documentation-function)))
 
 ;;;###autoload
 (add-hook 'org-mode-hook #'org-eldoc-load)
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-03-05  3:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-04  7:24 [PATCH] org-eldoc: Use eldoc-documentation-functions when available Štěpán Němec
2020-03-05  3:49 ` Kyle Meyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).