[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.90 
emacs/lisp/calendar/diary-lib.el:1.91
*** emacs/lisp/calendar/diary-lib.el:1.90       Wed Mar  9 00:29:14 2005
--- emacs/lisp/calendar/diary-lib.el    Fri Mar 11 21:44:06 2005
***************
*** 846,852 ****
               ;; Avoid redrawing when called recursively, eg through
               ;; mark-diary-entries-hook for #include's, else only get
               ;; the last set of diary marks.
!              (not marking-diary-entries))
      (setq mark-diary-entries-in-calendar nil)
      (redraw-calendar))
    (let ((marking-diary-entries t)
--- 846,855 ----
               ;; Avoid redrawing when called recursively, eg through
               ;; mark-diary-entries-hook for #include's, else only get
               ;; the last set of diary marks.
!              (not marking-diary-entries)
!              ;; If called from redraw-calendar, the calendar has been
!              ;; erased, so no need to unmark the diary entries.
!              (not calendar-redrawing))
      (setq mark-diary-entries-in-calendar nil)
      (redraw-calendar))
    (let ((marking-diary-entries t)