Re: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda

[Marco Wahl <marcowahlsoft@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1998 bytes --]

Hi Aaron,

Aaron Ecay <aaronecay@gmail.com> writes:
> 2014ko urriak 10an, Marco Wahl-ek idatzi zuen:
>> 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))
>
> The rule of thumb is that Org should support the current major version
> of emacs and one previous.

Just to be sure: Are 23.1 and 25.0 major versions of emacs?

> These functions have been aliased for a
> while, with fancy-diary-display marked as deprecated.  The commit that
> removed them from emacs
> <http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/118057> says this
> is at least since v 23.1, so it’s safe to just use the new name
> unconditionally.

Thanks for pointing that out.

>> +	 (diary-display-hook '(diary-display-function))
>
> This puts the symbol ‘diary-display-function’ in the list, which may
> or may not be correct (it’s different than the old behavior, which
> effectively put the value of that variable).  Maybe you want ‘(list
> diary-display-function)’ instead?

I would have wanted the latter.  Thanks again for the clarification.
But actually it does not matter since diary-display-hook has been marked
obsolete some versions ago.  See the emacs ChangeLog entry

2014-10-06  Glenn Morris  <rgm@gnu.org>
	Remove calendar code obsolete since at least version 23.1.
        ...diary-display-hook...fancy-diary-display...

The patch has shrunk considerably and hopefully is worth for the push
now.


Best regards,  Marco

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Fix: Emacs 25 fancy diary inclusion in agenda --]
[-- Type: text/x-diff, Size: 1266 bytes --]

From 3bc2837ebad7d6a6ffdceb53d4f95c260c1ee342 Mon Sep 17 00:00:00 2001
From: Marco Wahl <marcowahlsoft@gmail.com>
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


[-- Attachment #3: Type: text/plain, Size: 43 bytes --]

-- 
http://www.wahlzone.de
GPG: 0x0A3AE6F2