aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2004-02-23 00:09:31 +0000
committerGlenn Morris2004-02-23 00:09:31 +0000
commitde3fce917a4d536639b9bf24b66303fe4ad6c524 (patch)
tree6b10ae99acfc11cd8b5e9ef6916ddeb6e952967a
parent7420e0f55dea3b29131b92a272f65b89a6a6027c (diff)
downloademacs-de3fce917a4d536639b9bf24b66303fe4ad6c524.tar.gz
emacs-de3fce917a4d536639b9bf24b66303fe4ad6c524.zip
Matthew Mundell <matt@mundell.ukfsn.org>
(fancy-diary-display): Don't rely on return value of increment-calendar-month.
-rw-r--r--lisp/calendar/diary-lib.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index bb4ea20f804..f4150ee0825 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -587,8 +587,10 @@ This function is provided for optional use as the `diary-display-hook'."
587 (extract-calendar-month date)) 587 (extract-calendar-month date))
588 (setq holiday-list-last-year 588 (setq holiday-list-last-year
589 (extract-calendar-year date)) 589 (extract-calendar-year date))
590 (increment-calendar-month 590 (progn
591 holiday-list-last-month holiday-list-last-year 1) 591 (increment-calendar-month
592 holiday-list-last-month holiday-list-last-year 1)
593 t)
592 (setq holiday-list 594 (setq holiday-list
593 (let ((displayed-month holiday-list-last-month) 595 (let ((displayed-month holiday-list-last-month)
594 (displayed-year holiday-list-last-year)) 596 (displayed-year holiday-list-last-year))