From: Kyle Meyer <kyle@kyleam.com>
To: "James N. V. Cash" <james.cash@occasionallycogent.com>
Cc: bzg@gnu.org, emacs-orgmode@gnu.org
Subject: Re: eldoc recursion error
Date: Sun, 20 Sep 2020 19:38:20 -0400 [thread overview]
Message-ID: <87k0wovx1v.fsf@kyleam.com> (raw)
In-Reply-To: <87k0woxxb9.fsf@gmail.com>
James N. V. Cash writes:
> Indeed, testing with an eldoc backend (a personally hacked-up version of
> clojure's cider) that actually uses the callback, it wasn't working with
> the previous approach. I've attached a patch that addresses the
> previously-mentioned issues as well as this.
[...]
> @@ -114,11 +114,17 @@
> doc-func)
> (if (eq 'empty cached-func)
> (when (fboundp mode-func)
> - (with-temp-buffer
> - (funcall mode-func)
> - (setq doc-func (and eldoc-documentation-function
> - (symbol-value 'eldoc-documentation-function)))
> - (puthash lang doc-func org-eldoc-local-functions-cache))
> + (with-temp-buffer
> + (funcall mode-func)
> + (setq doc-func (if (boundp 'eldoc-documentation-functions)
> + (let ((doc-funs eldoc-documentation-functions))
> + (lambda (callback)
> + (let ((eldoc-documentation-functions doc-funs)
> + (eldoc--make-callback (lambda (_ignored) callback)))
> + (funcall eldoc-documentation-strategy))))
> + (and eldoc-documentation-function
> + (symbol-value 'eldoc-documentation-function))))
> + (puthash lang doc-func org-eldoc-local-functions-cache))
All right, so we can't get by without using eldoc--make-callback here?
Relying on a symbol marked with "--" makes me uneasy, and I'd like to
avoid it if possible. Does your cider test case above break if we use
eldoc-print-current-symbol-info without relaying the callback? That is,
this squashed into your patch:
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index b86ad1f39..06dcd6fe2 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/lisp/org-eldoc.el
@@ -118,10 +118,9 @@ (defun org-eldoc-get-mode-local-documentation-function (lang)
(funcall mode-func)
(setq doc-func (if (boundp 'eldoc-documentation-functions)
(let ((doc-funs eldoc-documentation-functions))
- (lambda (callback)
- (let ((eldoc-documentation-functions doc-funs)
- (eldoc--make-callback (lambda (_ignored) callback)))
- (funcall eldoc-documentation-strategy))))
+ (lambda ()
+ (let ((eldoc-documentation-functions doc-funs))
+ (eldoc-print-current-symbol-info))))
(and eldoc-documentation-function
(symbol-value 'eldoc-documentation-function))))
(puthash lang doc-func org-eldoc-local-functions-cache))
@@ -133,7 +132,7 @@ (declare-function css-eldoc-function "css-eldoc" ())
(declare-function php-eldoc-function "php-eldoc" ())
(declare-function go-eldoc--documentation-function "go-eldoc" ())
-(defun org-eldoc-documentation-function (&rest args)
+(defun org-eldoc-documentation-function (&rest _ignored)
"Return breadcrumbs when on a headline, args for src block header-line,
calls other documentation functions depending on lang when inside src body."
(or
@@ -166,12 +165,9 @@ (defun org-eldoc-documentation-function (&rest args)
(string= lang "go")
(string= lang "golang")) (when (require 'go-eldoc nil t)
(go-eldoc--documentation-function)))
- (t (let ((doc-fun (org-eldoc-get-mode-local-documentation-function lang))
- (callback (car args)))
+ (t (let ((doc-fun (org-eldoc-get-mode-local-documentation-function lang)))
(when (functionp doc-fun)
- (if (functionp callback)
- (funcall doc-fun callback)
- (funcall doc-fun)))))))))
+ (funcall doc-fun))))))))
;;;###autoload
(defun org-eldoc-load ()
next prev parent reply other threads:[~2020-09-20 23:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 19:22 eldoc recursion error James N V Cash
2020-09-17 4:55 ` Kyle Meyer
2020-09-17 15:03 ` James N. V. Cash
2020-09-20 4:54 ` Kyle Meyer
2020-09-20 15:35 ` James N. V. Cash
2020-09-20 15:49 ` James N. V. Cash
2020-09-20 23:38 ` Kyle Meyer [this message]
2020-09-21 1:07 ` James N. V. Cash
2020-09-21 1:36 ` Kyle Meyer
-- strict thread matches above, loose matches on Subject: below --
2020-09-08 13:49 Matt Price
2020-09-08 14:24 ` Bastien
2020-09-08 14:49 ` Matt Price
2020-09-08 14:53 ` Bastien
2020-09-08 15:27 ` Matt Price
2020-09-08 16:19 ` Matt Price
2020-09-11 4:12 ` Kyle Meyer
2020-09-21 1:51 ` Kyle Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k0wovx1v.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=james.cash@occasionallycogent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).