emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Fabrice Popineau <fabrice.popineau@gmail.com>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: Re: Problem with eldoc and Python
Date: Wed, 06 Jul 2016 23:27:15 +0200	[thread overview]
Message-ID: <87shvmfoek.fsf@saiph.selenimh> (raw)
In-Reply-To: <CAFgFV9PAG2RG7cXriHCytoHyAXtATzXzO=1gs4QwGLRhTcHUZA@mail.gmail.com> (Fabrice Popineau's message of "Wed, 6 Jul 2016 23:04:11 +0200")

Fabrice Popineau <fabrice.popineau@gmail.com> writes:

> The problem is that the byte code comes from Python mode.
> I solved the problem with this:
>
> $ diff -uw contrib/lisp/org-eldoc.el contrib/lisp/org-eldoc.el
> --- contrib/lisp/org-eldoc.el   2016-02-29 11:13:22.330099500 +0100
> +++ contrib/lisp/org-eldoc.el   2016-07-04 07:11:10.466144400 +0200
> @@ -155,7 +155,8 @@
>               (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)))
> -                (when (fboundp doc-fun) (funcall doc-fun))))))))
> +                (when (or (and (symbolp doc-fun) (fboundp doc-fun))
> +                         (functionp doc-fun)) (funcall doc-fun))))))))

Wouldn't

  (when (functionp doc-fun) (funcall doc-fun))

be enough?

Also, would you provide a patch for this?

Thank you.

Regards,

next prev parent reply	other threads:[~2016-07-06 21:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-03 22:09 Problem with eldoc and Python Fabrice Popineau
2016-07-06 20:41 ` Nicolas Goaziou
2016-07-06 21:04   ` Fabrice Popineau
2016-07-06 21:27     ` Nicolas Goaziou [this message]
2016-07-07  9:33       ` Fabrice Popineau
2016-07-07 10:21         ` Nicolas Goaziou

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=87shvmfoek.fsf@saiph.selenimh \
    --to=mail@nicolasgoaziou.fr \
    --cc=emacs-orgmode@gnu.org \
    --cc=fabrice.popineau@gmail.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

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).