[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#4626: 23; holidays not printed on multi-month calendar
From: |
Matthew Junker |
Subject: |
bug#4626: 23; holidays not printed on multi-month calendar |
Date: |
Sat, 3 Oct 2009 14:38:07 -0700 (PDT) |
Holidays are not printed after the first month of multi-month calendars. The
changes to cal-tex.el for determining the end date of the calendar for Emacs 23
were not quite right.
To see the problem, try "C-u 2 t M" in an older version and in version 23
(i.e., (cal-tex-cursor-month-landscape 2)).
The following patch seems to correct the problem.
--- /cygdrive/c/Program Files/emacs/current/lisp/calendar/cal-tex.el
2009-08-15 17:10:00.015625000 -0500
+++ cal-tex.el 2009-10-03 16:11:33.178552200 -0500
@@ -439,13 +439,13 @@
(end-year year)
(cal-tex-which-days '(0 1 2 3 4 5 6))
(d1 (calendar-absolute-from-gregorian (list month 1 year)))
- (d2 (calendar-absolute-from-gregorian
- (list end-month
- (calendar-last-day-of-month end-month end-year)
- end-year)))
- (diary-list (progn
- (calendar-increment-month end-month end-year (1- n))
- (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+ (d2 (progn
+ (calendar-increment-month end-month end-year (1- n))
+ (calendar-absolute-from-gregorian
+ (list end-month
+ (calendar-last-day-of-month end-month end-year)
+ end-year))))
+ (diary-list (if cal-tex-diary (cal-tex-list-diary-entries d1 d2)))
(holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
other-month other-year small-months-at-start)
(cal-tex-insert-preamble (cal-tex-number-weeks month year 1) t "12pt")
@@ -508,13 +508,13 @@
(end-month month)
(end-year year)
(d1 (calendar-absolute-from-gregorian (list month 1 year)))
- (d2 (calendar-absolute-from-gregorian
- (list end-month
- (calendar-last-day-of-month end-month end-year)
- end-year)))
- (diary-list (progn
- (calendar-increment-month end-month end-year (1- n))
- (if cal-tex-diary (cal-tex-list-diary-entries d1 d2))))
+ (d2 (progn
+ (calendar-increment-month end-month end-year (1- n))
+ (calendar-absolute-from-gregorian
+ (list end-month
+ (calendar-last-day-of-month end-month end-year)
+ end-year))))
+ (diary-list (if cal-tex-diary (cal-tex-list-diary-entries d1 d2)))
(holidays (if cal-tex-holidays (cal-tex-list-holidays d1 d2)))
other-month other-year)
(cal-tex-insert-preamble (cal-tex-number-weeks month year n) nil "12pt")
- bug#4626: 23; holidays not printed on multi-month calendar,
Matthew Junker <=