[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Problems with emacs 25 (master branch)
From: |
Marco Wahl |
Subject: |
Re: Problems with emacs 25 (master branch) |
Date: |
Fri, 10 Oct 2014 16:10:32 +0200 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) |
Thierry Volpiatto <address@hidden> writes:
> Tassilo Horn <address@hidden> 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
- Problems with emacs 25 (master branch), Cédric Chépied, 2014/10/10
- Re: Problems with emacs 25 (master branch), Tassilo Horn, 2014/10/10
- Re: Problems with emacs 25 (master branch),
Marco Wahl <=
- Re: Problems with emacs 25 (master branch), Michael Heerdegen, 2014/10/10
- Re: Problems with emacs 25 (master branch), Marco Wahl, 2014/10/11
- Re: Problems with emacs 25 (master branch), Cédric Chépied, 2014/10/13
- Re: Problems with emacs 25 (master branch), Michael Heerdegen, 2014/10/13