From: Marco Wahl <marcowahlsoft@gmail.com>
To: emacs-orgmode@gnu.org
Cc: Aaron Ecay <aaronecay@gmail.com>
Subject: Re: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda
Date: Sat, 11 Oct 2014 12:36:05 +0200 [thread overview]
Message-ID: <84siiuj3l6.fsf@tm6592.fritz.box> (raw)
In-Reply-To: 87lhonx578.fsf@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
next prev parent reply other threads:[~2014-10-11 10:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 14:20 [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda Marco Wahl
2014-10-10 16:25 ` Aaron Ecay
2014-10-11 10:36 ` Marco Wahl [this message]
2014-10-11 12:38 ` Bastien
2014-10-11 16:20 ` Marco Wahl
2014-10-11 17:45 ` Achim Gratz
2014-10-11 20:36 ` Aaron Ecay
2014-10-13 9:49 ` Marco Wahl
2014-10-13 9:43 ` Marco Wahl
2014-10-13 16:59 ` Achim Gratz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=84siiuj3l6.fsf@tm6592.fritz.box \
--to=marcowahlsoft@gmail.com \
--cc=aaronecay@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).