# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1212116390 0
# Node ID a31ff171eec41992cec8c5f6cd9b1103068ecff9
# Parent  ea54c6f7a388eda5ac2a40b00534515a042322b7
(org-get-entries-from-diary): Also set diary-display-function.

diff -r ea54c6f7a388 -r a31ff171eec4 lisp/org/org-agenda.el
--- a/lisp/org/org-agenda.el	Fri May 30 02:59:21 2008 +0000
+++ b/lisp/org/org-agenda.el	Fri May 30 02:59:50 2008 +0000
@@ -1,6 +1,7 @@
 ;;; org-agenda.el --- The table editor for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -2837,6 +2838,7 @@
   (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*")
          (fancy-diary-buffer diary-fancy-buffer)
 	 (diary-display-hook '(fancy-diary-display))
+	 (diary-display-function 'fancy-diary-display)
 	 (pop-up-frames nil)
 	 (list-diary-entries-hook
 	  (cons 'org-diary-default-entry list-diary-entries-hook))