2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb0d97bd3ab..c127269e6f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-03  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/appt.el (appt-check):
+        * calendar/diary-lib.el (diary-set-header, diary-live-p)
+        (diary-check-diary-file, diary-list-entries)
+        (diary-include-other-diary-files, diary-simple-display)
+        (diary-fancy-display, diary-print-entries)
+        (diary-mark-included-diary-files, diary-make-entry):
+        Don't call substitute-in-file-name on diary-file.
+
 2009-09-03  Eduard Wiebe  <usenet@pusto.de>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 3c39cd9960e..86856f2c124 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -331,8 +331,7 @@ displayed in a window:
                              (cons 'appt-make-list diary-hook))))
                       (diary))
                   (let* ((diary-display-function 'appt-make-list)
-                         (d-buff (find-buffer-visiting
-                                  (substitute-in-file-name diary-file)))
+                         (d-buff (find-buffer-visiting diary-file))
                          (selective
                           (if d-buff    ; diary buffer exists
                               (with-current-buffer d-buff
@@ -343,8 +342,7 @@ displayed in a window:
                     (if d-buff
                         ;; Displays the diary buffer.
                         (or selective (diary-show-all-entries))
-                      (and (setq d-buff (find-buffer-visiting
-                                         (substitute-in-file-name diary-file)))
+                      (and (setq d-buff (find-buffer-visiting diary-file))
                            (kill-buffer d-buff)))))
               (error nil)))
         (setq appt-prev-comp-time cur-comp-time