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
>From ebf45bd1c6d7435a8f9f991c6466bf704f223ce9 Mon Sep 17 00:00:00 2001 From: Marco Wahl <marcowahls...@gmail.com> Date: Fri, 10 Oct 2014 15:49:38 +0200 Subject: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda * lisp/org-agenda.el (org-get-entries-from-diary): Choose display function depending on version `fancy-diary-display' is `diary-fancy-display' in Emacs 25. --- lisp/org-agenda.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index da7993c..5fd9fbc 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5112,8 +5112,10 @@ of what a project is and how to check if it stuck, customize the variable "Get the (Emacs Calendar) diary entries for DATE." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (diary-display-hook '(fancy-diary-display)) - (diary-display-function 'fancy-diary-display) + (diary-display-function (if (version< emacs-version "25") + 'fancy-diary-display + 'diary-fancy-display)) + (diary-display-hook '(diary-display-function)) (pop-up-frames nil) (diary-list-entries-hook (cons 'org-diary-default-entry diary-list-entries-hook)) -- 2.1.2
-- http://www.wahlzone.de PGP: 0x0A3AE6F2
