diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-03-04 22:43:58 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-03-04 22:43:58 -0500 |
| commit | cf04f0837d606afc34971bce3101f70a914211c9 (patch) | |
| tree | 9ddb8d6791b31da85a7da8fbebd588ec1bbb45cd | |
| parent | a753bad1bfc78cbcd17d71021e2b229932ccfd1e (diff) | |
| parent | 7454d201895f1b52e04c7a406fde211f4b00e878 (diff) | |
| download | org-mode-cf04f0837d606afc34971bce3101f70a914211c9.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/lisp/org-eldoc.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el index b4fc0c8..72b10a1 100644 --- a/contrib/lisp/org-eldoc.el +++ b/contrib/lisp/org-eldoc.el @@ -161,7 +161,11 @@ (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) |