ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
Marco Wahl 2014-10-11 18:16:36 +02:00 committed by Bastien Guerry
parent a0ac1344fc
commit fdd9b18598
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-agenda.el
View File

@ -5089,8 +5089,7 @@ of what a project is and how to check if it stuck, customize the variable
"Get the (Emacs Calendar) diary entries for DATE." "Get the (Emacs Calendar) diary entries for DATE."
(require 'diary-lib) (require 'diary-lib)
(let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
(diary-display-hook '(fancy-diary-display)) (diary-display-function 'diary-fancy-display)
(diary-display-function 'fancy-diary-display)
(pop-up-frames nil) (pop-up-frames nil)
(diary-list-entries-hook (diary-list-entries-hook
(cons 'org-diary-default-entry diary-list-entries-hook)) (cons 'org-diary-default-entry diary-list-entries-hook))