Mercurial > emacs
changeset 104820:408195c2a9e5
(appt-check): Don't call substitute-in-file-name on diary-file.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 03 Sep 2009 06:35:25 +0000 |
| parents | 1468c5df344a |
| children | 25eb9d6cb593 |
| files | lisp/ChangeLog lisp/calendar/appt.el |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 03 06:34:19 2009 +0000 +++ b/lisp/ChangeLog Thu Sep 03 06:35:25 2009 +0000 @@ -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>
--- a/lisp/calendar/appt.el Thu Sep 03 06:34:19 2009 +0000 +++ b/lisp/calendar/appt.el Thu Sep 03 06:35:25 2009 +0000 @@ -331,8 +331,7 @@ (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 @@ (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