Use diary-file variable to point to diary file

Patch by Doug Hellman

contrib/ChangeLog

@@ -1,3 +1,8 @@
+2009-11-01  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* lisp/org-mac-iCal.el (omi-import-ics): Use `diary-file'
+	variable.
+
 2009-10-22  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* lisp/org-registry.el (org-registry-assoc-all)

contrib/lisp/org-mac-iCal.el

@@ -202,7 +202,7 @@ date range so that Emacs calendar view doesn't grind to a halt"
     (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))
 
 (defun omi-kill-diary-buffer (list)
   (mapc