# HG changeset patch # User Glenn Morris # Date 1254796595 0 # Node ID e3bdbd8a2169889f4b101a6f3858210b461ff96f # Parent dbbce03200d3c39e9f2365af002876fb74352fac Matthew Junker (tiny change) (cal-tex-cursor-month-landscape) (cal-tex-cursor-month): Correctly increment the end date for diary and holiday listing. (Bug#4626) diff -r dbbce03200d3 -r e3bdbd8a2169 lisp/ChangeLog --- a/lisp/ChangeLog Mon Oct 05 19:50:15 2009 +0000 +++ b/lisp/ChangeLog Tue Oct 06 02:36:35 2009 +0000 @@ -1,3 +1,9 @@ +2009-10-06 Matthew Junker (tiny change) + + * calendar/cal-tex.el (cal-tex-cursor-month-landscape) + (cal-tex-cursor-month): Correctly increment the end date for diary and + holiday listing. (Bug#4626) + 2009-10-05 Stefan Monnier * help-fns.el (describe-function-1): Don't burp is the function is not diff -r dbbce03200d3 -r e3bdbd8a2169 lisp/calendar/cal-tex.el --- a/lisp/calendar/cal-tex.el Mon Oct 05 19:50:15 2009 +0000 +++ b/lisp/calendar/cal-tex.el Tue Oct 06 02:36:35 2009 +0000 @@ -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")