changeset 60529:4358de407410

(mark-diary-entries): Only call redraw-calendar in the first of any recursive calls. Reported by Alan Shutko <ats@acm.org>.
author Glenn Morris <rgm@gnu.org>
date Wed, 09 Mar 2005 00:29:14 +0000
parents 952103a61e35
children 32fd45514893
files lisp/calendar/diary-lib.el
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)