* [PATCH] org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27
@ 2021-04-13 19:40 Trevor Murphy
2021-04-17 19:16 ` Kyle Meyer
0 siblings, 1 reply; 2+ messages in thread
From: Trevor Murphy @ 2021-04-13 19:40 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Trevor Murphy
* 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
---
contrib/lisp/org-eldoc.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index 7a6885160..550f857be 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/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)))
--
2.31.1.295.g9ea45b61b8-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27
2021-04-13 19:40 [PATCH] org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27 Trevor Murphy
@ 2021-04-17 19:16 ` Kyle Meyer
0 siblings, 0 replies; 2+ messages in thread
From: Kyle Meyer @ 2021-04-17 19:16 UTC (permalink / raw)
To: Trevor Murphy; +Cc: emacs-orgmode
Trevor Murphy writes:
> * 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.
Thanks. Pushed (7e2eba8cc).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-17 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-13 19:40 [PATCH] org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27 Trevor Murphy
2021-04-17 19:16 ` 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).