GNU bug report logs - #4626
23; holidays not printed on multi-month calendar

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (Emacs bug Tracking System)
To: Matthew Junker <junker <at> alum.mit.edu>
Subject: bug#4626 closed by Glenn Morris <rgm <at> gnu.org> (Re: bug#4626: 23;
 holidays not printed on multi-month calendar)
Date: Tue, 06 Oct 2009 02:45:07 +0000

[Message part 1 (text/plain, inline)]

This is an automatic notification regarding your bug report
which was filed against the emacs package:

#4626: 23; holidays not printed on multi-month calendar

It has been closed by Glenn Morris <rgm <at> gnu.org>.

Their explanation is attached below along with your original report.
If this explanation is unsatisfactory and you have not received a
better one in a separate message then please contact Glenn Morris <rgm <at> gnu.org> by
replying to this email.


-- 
4626: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4626
Emacs Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Glenn Morris <rgm <at> gnu.org>
To: 4626-done <at> debbugs.gnu.org
Subject: Re: bug#4626: 23; holidays not printed on multi-month calendar
Date: Mon, 05 Oct 2009 22:37:47 -0400

Thank you for the report and the patch; applied.

[Message part 3 (message/rfc822, inline)]

From: Matthew Junker <matthew.junker <at> sbcglobal.net>
To: bug-gnu-emacs <at> gnu.org
Subject: 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")

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.