Re: Problems with emacs 25 (master branch)

[Marco Wahl <marcowahlsoft@gmail.com>]

Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:

> Tassilo Horn <tsdh@gnu.org> writes:
>
>>
>> It seems `fancy-diary-display' has been renamed to
>> `diary-fancy-display'.  In your config, you probably have
>>
>>   (setq diary-display-function 'fancy-diary-display)
>>
>> and now you need to use
>>
>>   (setq diary-display-function 'diary-fancy-display)
>>
>> Or even better, you can just delete it from your configuration since
>> that's the default value with Emacs 25.
>
> Org in emacs-25 is still using `fancy-diary-display', see the function
> `org-get-entries-from-diary' and because the alias have been removed,
> org-agenda is broken...
>
> So this is a bug in `org-get-entries-from-diary'.

Thanks for the hint.  I will propose a corresponding patch to the Org list.

Concretely:

--8<---------------cut here---------------start------------->8---
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))
--8<---------------cut here---------------end--------------->8---


Ciao,  Marco
-- 
http://www.wahlzone.de
PGP: 0x0A3AE6F2