From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Wahl Subject: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda Date: Fri, 10 Oct 2014 16:20:08 +0200 Message-ID: <84d2a0ypk7.fsf@tm6592.fritz.box> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xcb3Y-0003Rb-Qa for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 10:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xcb3S-0004iL-So for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 10:20:32 -0400 Received: from plane.gmane.org ([80.91.229.3]:59642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xcb3S-0004i9-NH for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 10:20:26 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xcb3L-0006qc-Rj for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 16:20:19 +0200 Received: from stgt-5f7019fc.pool.mediaways.net ([95.112.25.252]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Oct 2014 16:20:19 +0200 Received: from marcowahlsoft by stgt-5f7019fc.pool.mediaways.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Oct 2014 16:20:19 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Hi, it has just been reported on the emacs devel list that 'fancy-diary-display' has been replaced by 'diary-fancy-display' in Emacs 25. This breaks diary inclusion into the agenda. I think the appropriate fix is to choose the display function dependending on the Emacs version. See the patch below. Comments are welcome. Best regards, Marco --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-Emacs-25-fancy-diary-inclusion-in-agenda.patch Content-Description: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda >From ebf45bd1c6d7435a8f9f991c6466bf704f223ce9 Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Fri, 10 Oct 2014 15:49:38 +0200 Subject: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda * lisp/org-agenda.el (org-get-entries-from-diary): Choose display function depending on version `fancy-diary-display' is `diary-fancy-display' in Emacs 25. --- lisp/org-agenda.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)) -- 2.1.2 --=-=-= Content-Type: text/plain -- http://www.wahlzone.de PGP: 0x0A3AE6F2 --=-=-=--