# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1110328154 0
# Node ID 4358de407410b73ef5382b0b202f5b581e1de11e
# Parent  952103a61e3506802bd047e3d4aac367d020d36b
(mark-diary-entries): Only call redraw-calendar in the first of any
recursive calls.  Reported by Alan Shutko <ats@acm.org>.

diff -r 952103a61e35 -r 4358de407410 lisp/calendar/diary-lib.el
--- a/lisp/calendar/diary-lib.el	Wed Mar 09 00:28:22 2005 +0000
+++ b/lisp/calendar/diary-lib.el	Wed Mar 09 00:29:14 2005 +0000
@@ -842,7 +842,11 @@
 `mark-diary-entries-hook' are run."
   (interactive)
   ;; To remove any deleted diary entries.
-  (when mark-diary-entries-in-calendar
+  (when (and mark-diary-entries-in-calendar
+             ;; 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)