(mark-diary-entries): Only call redraw-calendar in the first of any

recursive calls.  Reported by Alan Shutko <ats@acm.org>.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 97dc1dd0a7179110c4f9a74db628f614a52732a8..d682a3f1cc5a165986b27b7a953c29659aca8122 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -842,7 +842,11 @@ After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
 `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)