Subject: Bug#21796: exiting ediff can leave Emacs unresponsive to keyboard input

From: Noam Postavsky <[email-masked]>
Date: Fri, 23 Jun 2017 15:03:11 -0400

On Fri, Jun 23, 2017 at 1:54 PM, Jonathan Doull
<[email-masked]> wrote:
> I'm not sure how to apply your suggestion - ediff-window-setup-function is
> obsolete on my Emacs 24.5.
>
> describe-function returns this:

I expect Martin meant the variable, not the function; i.e., do this:

(setq ediff-window-setup-function #'ediff-setup-windows-plain)