emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Marco Wahl
Subject: Re: [O] [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda
Date: Sat, 11 Oct 2014 12:36:05 +0200
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux)

Hi Aaron,

Aaron Ecay <address@hidden> 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  <address@hidden>
        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

Attachment: 0001-Fix-Emacs-25-fancy-diary-inclusion-in-agenda.patch
Description: Fix: Emacs 25 fancy diary inclusion in agenda

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]