diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-10-06 02:36:35 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-10-06 02:36:35 +0000 |
| commit | 00169eb6835a00ca198aea8d3d6816d6dda5e4c0 (patch) | |
| tree | 9f7b14efbf508befc0825b4c3fdcd6e264978293 /lisp/calendar | |
| parent | 828821887bd26033b4eef18d5ff03cf49aa09a0b (diff) | |
| download | emacs-00169eb6835a00ca198aea8d3d6816d6dda5e4c0.tar.gz emacs-00169eb6835a00ca198aea8d3d6816d6dda5e4c0.tar.bz2 emacs-00169eb6835a00ca198aea8d3d6816d6dda5e4c0.zip | |
Matthew Junker <matthew.junker at sbcglobal.net> (tiny change)
(cal-tex-cursor-month-landscape)
(cal-tex-cursor-month): Correctly increment the end date for diary and
holiday listing. (Bug#4626)
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/cal-tex.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 829844b3ec1..171eabdf3de 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -439,13 +439,13 @@ Optional EVENT indicates a buffer position to use instead of point." (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 @@ indicates a buffer position to use instead of point." (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") |