emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: "Basil L. Contovounesios" <contovob@tcd.ie>
Cc: "James N. V. Cash" <james.nvc@gmail.com>, emacs-orgmode@gnu.org
Subject: Re: [PATCH] org-eldoc: Fix compatibility with Emacs 28
Date: Fri, 17 Jul 2020 18:11:07 -0400	[thread overview]
Message-ID: <87y2nheqro.fsf@kyleam.com> (raw)
In-Reply-To: <87h7u6v49q.fsf@tcd.ie>

Basil L. Contovounesios writes:

>> @@ -161,11 +161,17 @@ (defun org-eldoc-documentation-function ()
>>  (defun org-eldoc-load ()
>>    "Set up org-eldoc documentation function."
>>    (interactive)
>> -  (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)))
>> +  ;; This approach is taken from python.el.
>> +  (with-no-warnings
>> +    (if (null eldoc-documentation-function)
>> +	;; Emacs<25
>> +	(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)
>> +	(add-function :before-until (local 'eldoc-documentation-function)
>> +		      #'org-eldoc-documentation-function)))))
>
> LGTM.  My only aesthetic nit would be to replace the nested if with a
> flat cond, but that's entirely up to you.

I agree with your preference, though it didn't cross my mind when I was
lazily copying over from python.el.  Will update.

Thanks.


  parent reply	other threads:[~2020-07-17 22:12 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10 16:22 [PATCH] Make org-eldoc work " James N. V. Cash
2020-07-13 16:23 ` Nicolas Goaziou
     [not found]   ` <87zh83l66q.fsf@gmail.com>
2020-07-13 16:41     ` James N. V. Cash
2020-07-16  1:20 ` Basil L. Contovounesios
2020-07-16  4:29   ` Kyle Meyer
2020-07-16 14:34     ` James N. V. Cash
2020-07-17  5:41       ` [PATCH] org-eldoc: Fix compatibility " Kyle Meyer
2020-07-17 10:12         ` Basil L. Contovounesios
2020-07-17 16:13           ` Eric Abrahamsen
2020-07-17 22:11           ` Kyle Meyer [this message]
2020-07-17 11:24         ` Joseph Mingrone
2020-07-19  0:20           ` 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=87y2nheqro.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=contovob@tcd.ie \
    --cc=emacs-orgmode@gnu.org \
    --cc=james.nvc@gmail.com \
    --subject='Re: [PATCH] org-eldoc: Fix compatibility with Emacs 28' \
    /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 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).