summaryrefslogtreecommitdiff
path: root/lisp/calendar
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2005-03-09 00:29:14 +0000
committerGlenn Morris <rgm@gnu.org>2005-03-09 00:29:14 +0000
commit91199264e3bbe734bfc6cf87ed8be6cd8dbc84c6 (patch)
treef1d87dd3183f4ea26135b0b35ca7eb4870f08bcc /lisp/calendar
parentb924026db81f8af7ae4581f0fd26ec1f2a113889 (diff)
downloademacs-91199264e3bbe734bfc6cf87ed8be6cd8dbc84c6.tar.gz
(mark-diary-entries): Only call redraw-calendar in the first of any
recursive calls. Reported by Alan Shutko <ats@acm.org>.
Diffstat (limited to 'lisp/calendar')
-rw-r--r--lisp/calendar/diary-lib.el6
1 files changed, 5 insertions, 1 deletions
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)