[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el

[Glenn Morris]

Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.94 
emacs/lisp/calendar/diary-lib.el:1.95
*** emacs/lisp/calendar/diary-lib.el:1.94       Mon May 16 11:11:48 2005
--- emacs/lisp/calendar/diary-lib.el    Mon May 30 11:30:47 2005
***************
*** 1050,1064 ****
             (regexp-quote diary-include-string)
             " \"\\([^\"]*\\)\"")
            nil t)
!     (let ((diary-file (substitute-in-file-name
!                        (buffer-substring-no-properties
!                         (match-beginning 2) (match-end 2))))
!           (mark-diary-entries-hook 'mark-included-diary-files))
        (if (file-exists-p diary-file)
            (if (file-readable-p diary-file)
                (progn
                  (mark-diary-entries)
!                 (kill-buffer (find-buffer-visiting diary-file)))
              (beep)
              (message "Can't read included diary file %s" diary-file)
              (sleep-for 2))
--- 1050,1067 ----
             (regexp-quote diary-include-string)
             " \"\\([^\"]*\\)\"")
            nil t)
!     (let* ((diary-file (substitute-in-file-name
!                         (match-string-no-properties 2)))
!            (mark-diary-entries-hook 'mark-included-diary-files)
!            (dbuff (find-buffer-visiting diary-file)))
!       ;; TODO if dbuff is non-nil, should we check for modifications
!       ;; and offer to save it first?
        (if (file-exists-p diary-file)
            (if (file-readable-p diary-file)
                (progn
                  (mark-diary-entries)
!                 (unless dbuff
!                   (kill-buffer (find-buffer-visiting diary-file))))
              (beep)
              (message "Can't read included diary file %s" diary-file)
              (sleep-for 2))