comparison lisp/calendar/appt.el @ 104820:408195c2a9e5

(appt-check): Don't call substitute-in-file-name on diary-file.

104819:1468c5df344a

                           (if (assoc 'appt-make-list diary-hook)
                               diary-hook
                             (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)))
                         (selective
                          (if d-buff    ; diary buffer exists
                              (with-current-buffer d-buff
                                diary-selective-display))))
                    (diary)
                    ;; If the diary buffer existed before this command,
                    ;; restore its display state.  Otherwise, kill it.
                    (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)))
                           (kill-buffer d-buff)))))
              (error nil)))
        (setq appt-prev-comp-time cur-comp-time
              appt-mode-string nil
              appt-display-count nil)

104820:408195c2a9e5

                           (if (assoc 'appt-make-list diary-hook)
                               diary-hook
                             (cons 'appt-make-list diary-hook))))
                      (diary))
                  (let* ((diary-display-function 'appt-make-list)
                         (d-buff (find-buffer-visiting diary-file))
                         (selective
                          (if d-buff    ; diary buffer exists
                              (with-current-buffer d-buff
                                diary-selective-display))))
                    (diary)
                    ;; If the diary buffer existed before this command,
                    ;; restore its display state.  Otherwise, kill it.
                    (if d-buff
                        ;; Displays the diary buffer.
                        (or selective (diary-show-all-entries))
                      (and (setq d-buff (find-buffer-visiting diary-file))
                           (kill-buffer d-buff)))))
              (error nil)))
        (setq appt-prev-comp-time cur-comp-time
              appt-mode-string nil
              appt-display-count nil)