Hi,

it has just been reported on the emacs devel list that
'fancy-diary-display' has been replaced by 'diary-fancy-display' in
Emacs 25.

This breaks diary inclusion into the agenda.

I think the appropriate fix is to choose the display function
dependending on the Emacs version.  See the patch below.  Comments are
welcome.


Best regards,  Marco