>From 3bc2837ebad7d6a6ffdceb53d4f95c260c1ee342 Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Sat, 11 Oct 2014 11:39:02 +0200 Subject: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda * lisp/org-agenda.el (org-get-entries-from-diary): Use the suitable display function. Drop the usage of the obsolete diary-display-hook. fancy-diary-display has been dropped in Emacs 25. diary-fancy-display is the long known replacement of fancy-diary-display. diary-display-hook has been marked obsolete before Emacs 23.2. --- lisp/org-agenda.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index da7993c..fd99bc9 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5112,8 +5112,7 @@ 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 'diary-fancy-display) (pop-up-frames nil) (diary-list-entries-hook (cons 'org-diary-default-entry diary-list-entries-hook)) -- 2.1.2