From: Glenn Morris Date: Wed, 9 Mar 2005 00:29:14 +0000 (+0000) Subject: (mark-diary-entries): Only call redraw-calendar in the first of any X-Git-Tag: ttn-vms-21-2-B4~1868 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91199264e3bbe734bfc6cf87ed8be6cd8dbc84c6;p=emacs.git (mark-diary-entries): Only call redraw-calendar in the first of any recursive calls. Reported by Alan Shutko . --- diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 97dc1dd0a71..d682a3f1cc5 100644 --- 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)