From mboxrd@z Thu Jan  1 00:00:00 1970
From: Doug Hellmann <doug.hellmann@gmail.com>
Subject: org-mac-iCal.el uses hard-coded diary file name
Date: Sun, 1 Nov 2009 11:15:29 -0500
Message-ID: <E0535D8F-7C38-4E6D-9037-1B2092A3C196@gmail.com>
Mime-Version: 1.0 (Apple Message framework v936)
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N4d5d-0005cE-9K
	for emacs-orgmode@gnu.org; Sun, 01 Nov 2009 11:15:37 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N4d5Y-0005ZL-C3
	for emacs-orgmode@gnu.org; Sun, 01 Nov 2009 11:15:36 -0500
Received: from [199.232.76.173] (port=35952 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N4d5X-0005Z5-Sf
	for emacs-orgmode@gnu.org; Sun, 01 Nov 2009 11:15:31 -0500
Received: from mail-yx0-f191.google.com ([209.85.210.191]:62356)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <doug.hellmann@gmail.com>) id 1N4d5X-0006TE-JL
	for emacs-orgmode@gnu.org; Sun, 01 Nov 2009 11:15:31 -0500
Received: by yxe29 with SMTP id 29so4094286yxe.14
	for <emacs-orgmode@gnu.org>; Sun, 01 Nov 2009 08:15:30 -0800 (PST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: org-mode mailing list <emacs-orgmode@gnu.org>
Cc: suckling@gmail.com


org-mac-iCal.el doesn't use the diary-file variable to save the diary  
it generates, so if the variable isn't set to the same path as the  
hard-coded value in the library the diary entries don't show up in  
your agenda view.

I think the patch below fixes the problem.

Thanks,
Doug



diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el
index 056d73d..fa4e763 100644
--- a/contrib/lisp/org-mac-iCal.el
+++ b/contrib/lisp/org-mac-iCal.el
@@ -202,7 +202,8 @@ date range so that Emacs calendar view doesn't  
grind to a ha
      (goto-line 1)
      (write-region (point-min) (point-max) string))

-  (icalendar-import-file string (expand-file-name "~/.emacs.d/diary")))
+  (icalendar-import-file string diary-file))
+;;  (icalendar-import-file string (expand-file-name "~/.emacs.d/ 
diary")))

  (defun omi-kill-diary-buffer (list)
    (mapc