Mercurial > emacs

diff lisp/calendar/diary-lib.el @ 90118:e330fedc9152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-24 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 166-172) - Update from CVS - Tweak obsolete function/variable warning message - Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 38) - Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 10 Mar 2005 23:36:47 +0000
parents e4694597cbf4 4358de407410
children 8395880305fe
line wrap: on
line diff
--- a/lisp/calendar/diary-lib.el	Wed Mar 09 07:54:53 2005 +0000
+++ b/lisp/calendar/diary-lib.el	Thu Mar 10 23:36:47 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)