diff options
| author | Trevor Murphy <trevormurphy@google.com> | 2021-04-13 12:40:14 -0700 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-04-17 15:14:39 -0400 |
| commit | 958553f14cb8422577aa05a4fdec382d02688dc3 (patch) | |
| tree | d90722f86018488c5ce2705e86d0382ecda27ca4 | |
| parent | 6055c53064d3b5057e471a627126c1889a861bc2 (diff) | |
org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27
* contrib/lisp/org-eldoc.el (org-eldoc-documentation-function): Check
before invoking elisp eldoc functions from Emacs 28.
The previous check assumed that the presence of eldoc 1.11 bindings
implied elisp-mode bindings that come with Emacs>=28, but eldoc 1.11
is available on GNU Elpa so the assumption doesn't always hold.
TINYCHANGE
| -rw-r--r-- | lisp/org-eldoc.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-eldoc.el b/lisp/org-eldoc.el index 78f595c..b9b4460 100644 --- a/lisp/org-eldoc.el +++ b/lisp/org-eldoc.el @@ -144,7 +144,9 @@ (cond ((or (string= lang "emacs-lisp") (string= lang "elisp")) - (cond ((boundp 'eldoc-documentation-functions) ; Emacs>=28 + (cond ((and (boundp 'eldoc-documentation-functions) ; Emacs>=28 + (fboundp 'elisp-eldoc-var-docstring) + (fboundp 'elisp-eldoc-funcall)) (let ((eldoc-documentation-functions '(elisp-eldoc-var-docstring elisp-eldoc-funcall))) (eldoc-print-current-symbol-info))) |