diff options
author | Marco Wahl <marcowahlsoft@gmail.com> | 2014-10-11 18:16:36 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-10-13 00:19:07 +0200 |
commit | fdd9b18598239dd0e8b18383ac930110d51ed22e (patch) | |
tree | fbcd15060e1eccc95f32612d0619be78648a69ef | |
parent | a0ac1344fccc391abda4e5f5088a399e511b3607 (diff) | |
download | org-mode-fdd9b18598239dd0e8b18383ac930110d51ed22e.tar.gz |
[PATCH] Fix: Emacs 25 fancy diary inclusion in agendarelease_8.2.10
* 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.
-rw-r--r-- | lisp/org-agenda.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index e022936..c11c1c8 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -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." (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)) |