summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/calendar/diary-lib.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index d682a3f1cc5..124b29c3fe7 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -846,7 +846,10 @@ After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
;; 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))
+ (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)