I'm not sure how to apply your suggestion - ediff-window-setup-function is obsolete on my Emacs 24.5. describe-function returns this: --- ediff-choose-window-setup-function-automatically is a compiled Lisp function in `ediff-wind.el'. (ediff-choose-window-setup-function-automatically) This function is obsolete since 24.3; use `ediff-setup-windows-default' instead. Not documented. [back] --- The replacement function ediff-setup-windows-default is described as: --- ediff-setup-windows-default is a compiled Lisp function in `ediff-wind.el'. (ediff-setup-windows-default BUFFER-A BUFFER-B BUFFER-C CONTROL-BUFFER) Not documented. [back] --- *Jonathan Doull / *Director On Fri, Jun 23, 2017 at 6:23 PM, martin rudalics wrote: > > In the meantime do any fellow sufferers know a workaround (apart from > > dropping ediff)? > > Could you try with ‘ediff-window-setup-function’ set to > ‘ediff-setup-windows-plain’? > > martin > >