Re: view-other-diary-entries problems

[Markus Rost]

> Fixed.

Yes, indeed.

Here is another minor problem:  Suppose the diary file ~/diary does
not exist.  Call M-x calendar, and type "m" (mark-diary-entries).
You get an error:

Diary file `~/diary' does not exist

That's OK, of course.  But now some other keys have problems:

Hit C-x > (scroll-calendar-right).  The error about missing `~/diary'
is repeated, although you did do anything related with the diary.

What about the following patch?

2004-12-20  Markus Rost  <address@hidden>

        * calendar/diary-lib.el (mark-diary-entries): Set
        mark-diary-entries-in-calendar only after checking for diary-file.


===Buffer *vc-diff*=========================================
*** diary-lib.el        20 Dec 2004 15:36:39 -0500      1.85
--- diary-lib.el        20 Dec 2004 15:46:19 -0500      
***************
*** 841,851 ****
  After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
  `mark-diary-entries-hook' are run."
    (interactive)
-   (setq mark-diary-entries-in-calendar t)
    (let ((marking-diary-entries t)
          file-glob-attrs marks)
      (save-excursion
        (set-buffer (find-file-noselect (diary-check-diary-file) t))
        (message "Marking diary entries...")
        (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
        (let ((d diary-date-forms)
--- 841,851 ----
  After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
  `mark-diary-entries-hook' are run."
    (interactive)
    (let ((marking-diary-entries t)
          file-glob-attrs marks)
      (save-excursion
        (set-buffer (find-file-noselect (diary-check-diary-file) t))
+       (setq mark-diary-entries-in-calendar t)
        (message "Marking diary entries...")
        (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
        (let ((d diary-date-forms)
============================================================